Merge branch 'master' of https://github.com/kazo0/SOEN387-A2

Conflicts:
	src/soen387a2/JdbcUtilViaSSH.java
d