resolved merge conflict
Merge branch 'master' of github.com:brsoff/hubbub
Merge branch 'master' of github.com:brsoff/hubbub
added form template and render function to main.js