Added some small changes to templates
Ignore sqlite file
fixed merge conflict
Added accounts app and template