I DUNNO MAN LOL
Merge branch 'master' of https://github.com/halldorok11/Dorol

Conflicts:
	.idea/workspace.xml