basic results page. some is hard coded
delete coffeescript
actually deleted things this time
i just want to merge
disabled turbolinks, added homepage link, messed around with quiz
created a folder called application, put about contact and faq views in it, and updated routes
created a folder called application, put about contact and faq views in it, and updated routes 2
merging
Generate Profile model
Generate Profiles controller and routes. Added association between profile and user
Added/updated views for profiles/users/application controllers
Updated views and controllers for profile and user
Fix conflict
merging...
added pictures to welcome
added pictures to ten of the questions not showing currently
Merge quiz with master