Commit
Merge branch 'master' of https://github.com/Benjano/splAssignment3.git

Conflicts:
	Assignment3/src/implement/AssetImpl.java
Commit