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
fixed slider width again
wrote our README.md
Merge pull request #40 from zzzbra/master

README.md
user can load his/her songs; however no display for songs
Merge pull request #41 from iliastsangaris/refactor-js

major refactoring of javascript files
songs load in overlay
login and signup reset
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