initial commit
Merge branch 'master' of https://github.com/denisdenes/HackaTimis

Conflicts:
	.gitignore