Select the types of activity you want to include in your feed.
Merge branch 'master' of https://github.com/james7132/CS-3630-Huynh-Liu
james7132 11 years ago a04bb313 7b954d81