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

Conflicts:
	pages/software/osx.textile