Merge pull request #10 from supremebeing7/testing

Testing
add Capybara testing and Factory Girl implementation
Merge branch 'master' into testing

Adds testing with Capybara and FactoryGirl