Initial commit
Merge branch 'master' of https://github.com/Exalyon/if26-TD

Conflicts:
	.gitignore