new theme, two cols, favicon, 404, dev by sass
Merge branch 'master' of https://github.com/ran01/ran01.github.io

Conflicts:
	404.html