getting up to date
Merge branch 'master' into marcus
started styling
Merge branch 'master' into marcus
expense_copy fixed
Merge branch 'master' into marcus

fixed css conflict
Conflicts:
	app/assets/stylesheets/custom.css.scss
Merge pull request #48 from elitenomad/marcus

Marcus