bla
Revert "Skapar vy och kontroller."

This reverts commit 0e9f78bd8cd6b65db3a992f5f3d0451a8e2cd112.

Conflicts:
	src/View/View.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/View/View.java