Functions uf amderem require context calle,
merge
Merge
Merge branch 'master' of https://github.com/sKaNoN/IntTeMiniprojekt2.git

Conflicts:
	public/init.js
	public/modules/ui.js