Merge pull request #1 from blacshad/master

OK
UUUU
UUUU
Merge commit '6a81b737d6d000eabe0061a79dde6695a50ca746'

Conflicts:
	src/index.jade