more consolidation and design
Merge branch 'master' of https://github.com/bkonold/campusyelp

Conflicts:
	UCLAYelp/bin/classes/com/example/uclayelp/EntreeDetailsActivity.class
	UCLAYelp/bin/classes/com/example/uclayelp/R$id.class
Revert "more consolidation and design"

This reverts commit fb9aadc37bf5fa7301d3c5971a4339bf4aea4c23.

Conflicts:
	UCLAYelp/bin/classes/com/example/uclayelp/EntreeDetailsActivity.class
hopefully this works