ChangeSomethingCommit
Endret versjon
Merge pull request #2 from FreddyWetjen/ChangeSomething

ChangeSomethingCommit
Merge pull request #1 from ThomasEdvardsen/ThomasBranch

Endret versjon til 1.1
Merge remote-tracking branch 'upstream/master' into RogersBranch

Conflicts:
	src/main/java/no/nb/git/test/HelloWorld.java
Merge remote-tracking branch 'upstream/master' into RogersBranch

Conflicts:
	src/main/java/no/nb/git/test/HelloWorld.java