fixing merge issues
Merge branch 'master' of https://github.com/thebkbuffalo/travel_breakdown_app
working auth
Merge pull request #13 from thebkbuffalo/auth_round_2

Auth round 2