first commit
Create .gitignore
Merge branch 'master' of github.com:mikotoni/TMA

Conflicts:
	.gitignore