migrate database
test for errors
try
include new templates
Merge branch 'master' of https://github.com/Tiotao/Yikes