.
Merge branch 'master' of https://github.com/SirCunningham/labb6

Conflicts:
	BuilderList.java
Merge branch 'master' of https://github.com/SirCunningham/labb6