Init commit
Merge branch 'master' of intense:/home/git/git/gogs-repositories/simon/soyhtml

Conflicts:
	.gitignore
edit
it works