re #47 - Content changes
Merge branch 'feature/33-nyamu' of https://github.com/nooku/www.nooku.org into feature/33-nyamu

Conflicts:
	css/style.css
	css/style.css.map