create readme for github
Merge branch 'dev'
change templator to jade; move templates to new templator
Merge branch 'master' into dev
remove index.html