Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app into scss

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/application.css.scss
first commit for scss file on new branch
stuff
sass
any file with tilde is temp and pls remove
merged scss with master
trying to merge files to scss
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app