Changed to IP
Merge branch 'master' of github.com:Distribuerede-systemer/server

Conflicts:
	src/model/QOTD.java
Merge branch 'master' of github.com:Distribuerede-systemer/server