Everything done
Merge branch 'master' of https://github.com/cooperra/AlumniPerks-Android

Conflicts:
	RosePerks/res/values/strings.xml
	RosePerks/src/edu/rosehulman/roseperks/PerksListView.java