added authorization via cancan and a guest account
added stopwatch
updated guest login message
cleaned up user menus
Merge with heroku
Update to rails 3.2.16, merge with heroku