First post!
Merge branch 'master' of ../tics

Conflicts:
	.gitignore