small style changes
updated the cell spec file to check the two new color/sounds
Merge pull request #30 from SamMatthews9/savesong

updated the cell spec file to check the two new color/sounds
fixed a bug, so users can only log in when they enter the correct password
Merge pull request #31 from SamMatthews9/savesong

fixed a bug, so users can only log in when they enter the correct passwo...
Merge branch 'master' into appJS
Merge branch 'appJS'
merge

Merge branch 'master' of github.com:SamMatthews9/JavaScript-Motion-Activated-Midi

Conflicts:
	app/views/layouts/application.html.erb
Merge pull request #33 from SamMatthews9/modal

styles for modals, still working...
merged scss for modal
Merge branch 'master' of github.com:SamMatthews9/JavaScript-Motion-Activated-Midi
Merge pull request #34 from SamMatthews9/modal

more modal stytles
switching to ajax calls for modals