Added files I forgot to include
Merge branch 'master' of https://github.com/carolinemarcks/blockytalky-ror
Added missing users controller