pre-merge commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/me/spider/spidership/Category.java
	src/me/spider/spidership/ShoppingCart.java
pre-merge commit
Merge remote-tracking branch 'origin/master'
Interfaces created and implemented and connected to SpiderShip. Some methods still missing.