Bathroom check
Merge remote-tracking branch 'origin/casper' into casper

Conflicts:
	app/src/main/java/com/palindromicstudios/gottago/MainPage.java