Merge branch 'master' of https://github.com/cisprocess/skk-cs4230-project-1

Conflicts:
	src/cs4230/pedestrian/objects/Door.java
Dunno what is happening here