generalized Tiles
push
Merge branch 'master' of
https://github.com/College-Living/College-Living.git

Conflicts:
	src/com/collegeliving/ApartmentList.java
Merge branch 'lumin'