small style changes
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
merged scss for modal
Merge branch 'master' of github.com:SamMatthews9/JavaScript-Motion-Activated-Midi