adding the new and create stuff
attempting merge conflict fix
Merge branch 'master' of https://github.com/michaelmuse/fantastico