Fix the thingy
Merge branch 'master' of https://github.com/raymondzeng/tortoise

Conflicts:
	NFCTortoise/app/app.iml
	NFCTortoise/app/src/main/AndroidManifest.xml
	NFCTortoise/app/src/main/java/edu/brown/perkins/nfctortoise/MyActivity.java
	NFCTortoise/app/src/main/res/layout/activity_my.xml