shit
Merge branch 'master' of
https://github.com/njardiss/DatabaseProsjekt.git

Conflicts:
	DatabaseProsjekt/ClientMethods.java