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

Adds testing with Capybara and FactoryGirl
Merge pull request #11 from supremebeing7/testing

Testing
resolve merge conflicts