lifewinning/1033 — pull request #1 by lifewinning (2014-12-20 00:28:48+00:00)
Title: tidying up

just want master and pages to play nice