so close
Merge branch 'master' of
https://github.com/stephenrubio94/Pandora-s-Key.git

Conflicts:
	pandorakey4/bin/classes.dex
	pandorakey4/bin/pandorakey4.apk
	pandorakey4/bin/resources.ap_
	pandorakey4/src/fordhamcss/pandorakey4/MainActivity.java