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

Conflicts:
	pages/other/server.textile
	pages/other/website.textile
update