merge & typo fix
moving markup to jade and stylus