bla
update
Merge branch 'master' into lumin
setting
gps fix
update
refined apartment list
Merge branch 'derek'

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

Conflicts:
	res/layout/activity_settings_screen.xml
generalized Tiles
push
Merge branch 'master' of
https://github.com/College-Living/College-Living.git

Conflicts:
	src/com/collegeliving/ApartmentList.java
roomiesList, fixed some profile, and unedited main screen
made it match parent width