rspec working
Merge branch 'master' of https://github.com/vise890/funky_learn into unit_tests
factories set up
rspec working
resolve merge conflicts