New
Merge branch 'master' of https://github.com/VrijVlinder/Glass

Conflicts:
	Readme.txt
	about.php
	design/custom.css
	design/favicon.png
	design/images/contnt.png
	design/images/menu_bg.png
	design/images/woodbig.jpg
	screenshot.png
	views/default.master.php