PO
Merge commit '6a81b737d6d000eabe0061a79dde6695a50ca746'

Conflicts:
	src/index.jade
EDOT
HAVE EDITED
Merge pull request #2 from blacshad/master

HAVE EDITED