Please fucking work
Merge branch '2.0' of http://github.com/gpascale/combinator-website into 2.0

Conflicts:
	.gitignore
	src/html/index.html
	src/less/combinator.less