somebody once told me the world is gonna roll me. i ain't the sharpest tool in the shed.
Merge branch 'master' of https://github.com/rascheel/Cpre388Lab9

Conflicts:
	src/com/example/nfcawesome/MainActivity.java

(resolved)