working through edit and show for users
merging questions into our current branch
Merge branch 'master' of https://github.com/rickytux/OurProject into users_create
add not found error message
basic profile page
Merge pull request #15 from catherinev/questions

Questions
add edit profile link
user can edit profile
cleaned layout code, added Profile link, allow users to edit and update profile
adding user shit that works
Merge branch 'master' of https://github.com/rickytux/OurProject into users_create
Merge pull request #16 from catherinev/users_create

Users create
reorg for heroku
Merge pull request #17 from catherinev/reorg_for_heroku

reorg for heroku
start of ajax for answer submission
ajaxified add an answer
added lots of problems
fuck github