pictures
Merge branch 'master' of https://github.com/ShakeYourMusicInstrument/ShakeMusic

Conflicts:
	src/com/android/shakemusic/Guitar.java
	.git/MERGE_HEAD