Created templates for / and /admin
Merge branch 'master' of origin

Conflicts:
	README.md
rename README.md to README