toto commit
toto commit
Merge origin/master

Conflicts:
	.gitignore
	src/inf2015_lab3/INF2015_Lab3.java