First commit
Merge branch 'master' of github.com:pabloformoso/CITIC02

Conflicts:
	.gitignore