finito!
Merge branch 'master' of https://github.com/nba1992/PC_1415I

Conflicts:
	Serie1/Completion/src/Completion.java