Fixes
Merge branch 'master' of https://github.com/conditionizr/conditionizr.github.com

Conflicts:
	assets/css/global.min.css
	index.html