commit from branch
lets get this show on the road
with incomplete rspec controller testing
Merge branch 'master' of https://github.com/aabrahamians/Sentimapper