Added gitignore
Initial skeleton
Merge branch 'master' of github.com:arsemyonov/collaudo

Conflicts:
	.gitignore