updated
updated
Merge branch 'master' of https://github.com/mrhack/garnier

Conflicts:
	css/style.css