more consistency in code, some code testing
Merge branch 'master' of github.com:carolinemarcks/blockytalky-ror