Broken REad
oFUCKING Merge branch 'master' of https://github.com/jposton2/cs326

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