Added toolbar functionality
Merge branch 'master' of https://github.com/CSE120PowerRangers/MusicNotes

Conflicts:
	bin/MusicNotes.apk
	bin/classes.dex
	bin/classes/Listeners/EditorDragListener$DeleteFlag.class
	bin/classes/Listeners/EditorDragListener.class
	bin/classes/Listeners/EditorTouchListener.class
	bin/classes/com/example/musicnotes/EditorActivity$1.class
	bin/classes/com/example/musicnotes/EditorActivity$2.class
	bin/classes/com/example/musicnotes/EditorActivity$3.class
	bin/classes/com/example/musicnotes/EditorActivity$EditorVal.class
	bin/classes/com/example/musicnotes/EditorActivity.class
	src/Listeners/EditorDragListener.java
	src/Listeners/EditorTouchListener.java