Adapting the title
Adding subtitle
Merge branch 'master' of github.com:clojurecup2014/amindblowingworld

Conflicts:
	resources/public/css/app.css