Site updated at 2014-07-30 07:46:55 UTC
Merge branch 'master' of https://github.com/wmeints/wmeints.github.io

Conflicts:
	.travis.yml