committing to pull
bill changes
committing to pull
Merge branch 'develop' of github.com:mikebeaujean/musicapp into develop

Conflicts:
	app/assets/javascripts/main.js
	app/views/welcome/index.html.erb
first draft of metronome
first draft of metronome
first draft of metronome