Added Callans key
Merge branch 'master' of https://github.com/rutgersc/apptest

Conflicts:
	android/AndroidManifest.xml