fixed footer
:D
Merge branch 'master' of https://github.com/kentwidman/darkest_days

Conflicts:
	sass/_styles.scss
	stylesheets/app.css
Merge branch 'master' of https://github.com/kentwidman/darkest_days

Conflicts:
	sass/_styles.scss
	stylesheets/app.css