- test3
Merge branch 'master' of https://github.com/OrangeSean/AtCMUA-Android

Conflicts:
	AtCMUA Mobile App/bin/classes/edu/cmu/atcmua/tools/GetFeed.class