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
Merge pull request #70 from thebkbuffalo/more_capybara_testing

big more testing/refactoring of show pages
merged scss with master
trying to merge files to scss
Merge branch 'master' of github.com:thebkbuffalo/travel_breakdown_app
fixing scope issues
Merge branch 'master' of https://github.com/thebkbuffalo/travel_breakdown_app
header is admin problem solved
fixed groceries and added owed to table
insignif