Modify comments controllers spec and added factories file - not with correct info
Merge branch 'comments-TDD'
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo
Removing spaces but no other real changes
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo
move validation in comments model to above query method
Merge branch with master
Merge this master with upstream master
Merge translate-API branch to this master
Comment out merge conflict marks, add parentheses
Merge with upstream master
Merge branch 'master' into translate-API
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo
Merge branch 'master' into translate-API
Add skeleton of factories and begin to add TDD for comments
Fix gemfile merge issue
Add factory_girl to gem file, add factory_girl to rails_helper, add test for new comment
Modify factories to include query factory, add test for successful comment save
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo
Add test for creating a comment that does not save - does not work yet