more stuff
Merge branch 'master' of github.com:chrisjeon/cash_cache

Conflicts:
	app/assets/stylesheets/welcome.css.scss
	app/views/layouts/_header.html.erb