commit test
Merge branch 'master' into seb

Conflicts:
	gen/com/example/solfege/R.java