Merge pull request #44 from jermspeaks/routes-check

Routes check
Merge pull request #46 from jermspeaks/fix-s3

Fix s3
Merge pull request #48 from jermspeaks/master

Changes from Fork
started home page specs
Merge pull request #49 from simongondeck/feature-tests-home

started home page specs
travis added
Merge pull request #50 from simongondeck/travis-s3-new

travis added
travis please work
travis hates indents
fixing travis
Merge pull request #51 from simongondeck/quy-thursday

fixing travis
fixing travis again
fixing travis again and again
Merge pull request #52 from simongondeck/quy-thursday

fixing travis again
travissss
Merge pull request #53 from simongondeck/quy-thursday

travissss
Merge branch 'master' of https://github.com/simongondeck/flight-social-network into simon-sayss