footer fixed to bottom of the page
Merge branch 'master' into federico

conflict merge
Conflicts:
	app/assets/stylesheets/custom.css.scss
Merge pull request #63 from elitenomad/federico

Federico