removed merge message from the application controller
fixed merging issue
commented out the seed file, because it's not functioning properly
Merge branch 'master' of github.com:SamMatthews9/JavaScript-Motion-Activated-Midi into appJS
made row1 in seed.rb...needs refactoring