setting screen
Merge branch 'master' of https://github.com/College-Living/College-Living.git
main screen
added to iMac
bla
Merge branch 'master' into lumin
location services
settings screen...
update
Merge branch 'master' into derek

Conflicts:
	res/layout/activity_main_screen.xml
Added pads and setting tiles onClick