ok
Merge branch 'master' of https://github.com/gibu/hackDay2013

Conflicts:
	resources/css/custom.css