bla
update
Merge branch 'master' into lumin
setting
Added profile activity and my profile activity. Also added the main
screen on click for roomies and profile but they are commented out
changed profile screen to apartment profile and added student profile
update
Stock images and student profile activity
Merge branch 'derek'

Conflicts:
	res/values/strings.xml
Merge branch 'lumin'

Conflicts:
	res/layout/activity_settings_screen.xml