initial commit
Merge branch 'master' of github.com:macostea/iCluj

Conflicts:
	README.md