Merge branch 'master' of https://github.com/BrennaBlackwell/spARK.git

Conflicts:
	spARK/bin/spARK.apk
Merge branch 'master' of https://github.com/BrennaBlackwell/spARK.git