FIXES THE GEMFILE DOUBLES DAMNIT!
fixes the fucking gemfile
Merge branch 'bourbon_test'

Conflicts:
	Gemfile
maybe this will fix the gemfile?
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app