Added contact
Added style.sass
Fixed site.yml
Merged template conflicts
Um...
Merge branch 'master' of https://github.com/leeavital/personal-site

Conflicts:
	templates/default.liquid