NFC READING
Merge branch 'master' of https://github.com/rascheel/Cpre388Lab9

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

(resolved)