attempting to render js in index page
Merge remote-tracking branch 'origin'

merging with austin's addition of a js file so that we can attempt rendering using ruby on rails'
Merge branch 'master' of https://github.com/OHIOhackathon2014/Team08Hackathon2014

Committing some changes for index.y