added start date to user, changed expected hours to reference this, and gave admin ability to edit
Updated rails to avoid ActionPack vuls.

https://groups.google.com/forum/#!topic/rubyonrails-security/61bkgvnSGTQ/discussion
Merge branch 'master' of https://github.com/isotope11/xrono
Updated rails so we don't get bitten by the JSON bug.

  CVE-2013-0276
  CVE-2013-0277
  http://weblog.rubyonrails.org/2013/2/11/SEC-ANN-Rails-3-2-12-3-1-11-and-2-3-17-have-been-released/
Merge conflicts
added rvmrc
added focus for email input field on login form
Merge pull request #26 from megalithic/login-win

Added focus to login email input field.
Merge pull request #24 from jrgifford/master

Updated rails to avoid ActionPack vuls.
Merge conflicts
merge conflict, fix attempt duos