not sure what I did here.
Merge branch 'master' of https://github.com/daniriv12/project

Conflicts:
	SingingWithNina2/bin/SingingWithNina2.apk
	SingingWithNina2/bin/classes.dex