Hej
Lab5
Merge branch 'master' of github.com:Dracyr/EDAF05_ruby

Conflicts:
	lab4/conq.rb