hejhopp
asdasd
Merge branch 'master' of https://github.com/FilipHarald/Julprojekt

Conflicts:
	src/project/Color.java
	src/project/ColorDisplay.java
	src/project/IntDisplay.java
Merge branch 'master' of https://github.com/FilipHarald/Julprojekt

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'master' of https://github.com/FilipHarald/Julprojekt

Conflicts:
	src/project/Array7x7.java
Merge branch 'master' of https://github.com/FilipHarald/Julprojekt

Conflicts:
	src/project/Array7x7.java