hopefully the fix that changes the world

;alsdfhjk
Merge branch 'master' of https://github.com/jposton2/cs326

Conflicts:
	QR-Labyrinth/src/com/cs326/team5/qr_labyrinth/CustomLevelActivity.java