added footer
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/css/styles.css
	public/sass/styles.scss