Merge branch 'master' into Iteration_changes_Chris

Conflicts:
	app/src/main/java/com/example/chris/escape201game/Escape201Game.java
	app/src/main/res/layout/activity_level1.xml
Merge branch 'master' into Iteration_changes_Chris

Conflicts:
	app/src/main/java/com/example/chris/escape201game/Escape201Game.java
	app/src/main/res/layout/activity_level1.xml
Iteration 3