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

Conflicts:
	pages/development-design/web-front-end.textile