dont know what i did...
Merge branch 'master' of https://github.com/jonatanl/fellesprosjekt

Conflicts:
	java/src/Models/Event.java