update
Merge branch 'master' of github.com:jonaslam/jonaslam.github.com

Conflicts:
	assets/style.css