making single form; preparing for php
Merge branch 'master' of github.com:vnmc/testinator