setting screen
Merge branch 'master' of https://github.com/College-Living/College-Living.git
main screen
bla
Merge branch 'master' into lumin
settings screen...
Merge branch 'master' into derek

Conflicts:
	res/layout/activity_main_screen.xml