working on the welcome page
fixing merge conflict
added js file and nav bar to application.html.erb
Merge pull request #34 from nicholalexander/FrontEnd

New Nav Bar (under construction) and added Wheel JS library for future use