Footer done
Merge branch 'master' of github.com:djmosc/nazaninrosematin
layout?
Merge branch 'master' of github.com:djmosc/nazaninrosematin

Conflicts:
	css/scss/_layout.scss
codekit