Endringer fra Roger.
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
Merge pull request #3 from RogerMathisen/RogersBranch

Rogers branch