add tutorial and add CV
Merge branch 'master' of github.com:maxis1718/maxiskao

Conflicts:
	templates/profile.html
html->tpl
add static page
html -> tpl