wired shit up
yee fixes
Merge branch 'master' of github.com:ryanboye/fun-money

Conflicts:
	css/style.sass
	index.html