techno notes fix
Merge branch 'master' of https://github.com/daniriv12/project

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

SingingWithNina2/bin/classes/com/example/singingwithnina2/GrapherTwo.cla
ss

SingingWithNina2/bin/classes/com/example/singingwithnina2/HighScores.cla
ss

SingingWithNina2/bin/classes/com/example/singingwithnina2/PlaySingActivi
ty$1.class

SingingWithNina2/bin/classes/com/example/singingwithnina2/PlaySingActivi
ty.class
	SingingWithNina2/bin/classes/com/example/singingwithnina2/Start.class
	SingingWithNina2/bin/resources.ap_