False commit
Merge branch 'master' of https://github.com/Tunder1992/INF1B

Conflicts:
	ShaVar/Main/src/com/stenden/pinit/Overview.java