Merging changes
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes
Bug found. Tapping on an existing note with a different tool doesn't actually modify the underlying note. Needs to be implemented in the touch listener. Also vibration on long click would be handy for haptic feedback
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	bin/MusicNotes.apk
Changed vibrate duration to 75 ms. Allows for really short single buzz. Need to fix it so that it only buzzes if there's a note underneath