rendering basic squares onto page
Merge branch 'develop' of github.com:mikebeaujean/musicapp into develop
added timbre.js library
added home link header to application/layout
added timbre to javascripts/application; disabled Turbolinks
committing to pull
bill changes
rigged up squares to A-major scale
committing to pull
added webaudioapi library
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
implemented WebAudioAPI oscillator in a semi-usable way
fixed merge conflict in main.js
recopied webaudioapi.js file to fix errors