stuffes
Merge branch 'master' of https://github.com/daren511/Labo_07_Java

Conflicts:
	Labo7Java/src/Connection.java
Merge branch 'master' of https://github.com/daren511/Labo_07_Java