heroku commit
Merge branch 'master' of https://github.com/Tunneylax20/JSequencr
Merge branch 'master' of https://github.com/Tunneylax20/JSequencr
Merge branch 'master' of https://github.com/Tunneylax20/JSequencr
pre merge commit
Merge branch 'master' of https://github.com/Tunneylax20/JSequencr

Conflicts:
	app/assets/javascripts/html_audio_api.js
Merge branch 'master' of https://github.com/Tunneylax20/JSequencr
user can load his/her songs; however no display for songs
songs load in overlay
Merge pull request #42 from stevenaweiss/master

login and signup forms reset
load adds sound patterns
page overlay clears properly
removes previous songs when loading another song
add load bpm
merge
merge
Merge pull request #43 from cranbury/master

Load user songs
slider back
Merge pull request #44 from cranbury/master

slider back
css changes