Is still broke'd
Merge branch 'ErikBranch' of github.com:Senuska/CGDD4303-Project into ErikBranch

Conflicts:
	main.js
May be fix?