dsf
Merge branch 'master' of
https://github.com/Rune91/Prosjekt_RuneHagbergStana.git

Conflicts:
	Kurve/src/game/Main.java
	Kurve/src/game/Panel.java
	Kurve/src/snake/Snake.java