heroku commit
Merge branch 'master' of https://github.com/Tunneylax20/JSequencr
Merge branch 'master' of https://github.com/Tunneylax20/JSequencr
merging
Merge branch 'master' of https://github.com/Tunneylax20/JSequencr
merging again
fixing more merges
pre merge commit
more merges
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
Merge branch 'master' of https://github.com/Tunneylax20/JSequencr
login and signup slide
created links for signup and login, show and hide appropriately
Merge pull request #39 from stevenaweiss/login-controls-slide

Login controls slide, created links for login/signup, hide and show appropriately
Merge pull request #40 from zzzbra/master

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

major refactoring of javascript files
songs load in overlay