Took the form out of the master page
Merge branch 'master' of https://github.com/pccsei15/ninja