Jekyll generator is alright too
Merge branch 'master' of github.com:dudemountain/dudemountain.github.io

Conflicts:
	index.html