Adding stuff
Merge branch 'master' of github.com:andreasmcdermott/andreasmcdermott.github.io

Conflicts:
	_layouts/default.html
	_layouts/post.html
	assets/Thumbs.db
	css/site.css
	index.html