Afegit .gitignore
Merge branch 'master' of github.com:pauc/PAC3

Conflicts:
	PAC3/.gitignore