merge issues
Merge branch 'master' of https://github.com/thebkbuffalo/travel_breakdown_app
merge shenanigans
css fix
merge'
css