added testing, make edit page show
rspec spec'ed user model
Merge branch 'master' of https://github.com/AkermanGreg/happy