Städat imports och supressat varningar
Merge remote-tracking branch 'origin/master'

Conflicts:
	namnfil.txt
	src/sorting/ResultWriter.java
Merge branch 'master' of github.com:Meldanya/pvg-vt13-team03