Fefactored routes
added user stuff not done yet
Merge pull request #3 from salamanders-2014/refactor_routes

Fefactored routes
Fixed routing conflict
Merge pull request #2 from salamanders-2014/addUserFunctionality

added user stuff not done yet
added sessions login logic
Merge pull request #4 from salamanders-2014/joeUsers

added sessions login logic
added capybara, added tests for sessionscontroller
made changes to session tests and removed testing Gemfile version locks
Merge pull request #5 from salamanders-2014/addUserstuff

added capybara, added tests for sessionscontroller
added travis.yml
added .travis.yml
added simplecov
Merge pull request #6 from salamanders-2014/addSimpleCov

added simplecov
added user tests
Merge pull request #7 from salamanders-2014/addUserTests

added user tests
added codeship status
merge conflicts resolved