commit before push
Merge branch 'master' of https://github.com/vberthiaume/solfege

Conflicts:
	gen/com/example/solfege/R.java
	project.properties
Merge branch 'master' of https://github.com/vberthiaume/solfege

Conflicts:
	assets/VexFlowTutorial.htm