Conf. Exclude
Merge branch 'master' of https://github.com/UOC/Tandem

Conflicts:
	.gitignore