Lots of stuff.

Archive was refactored to properly be a singleton, so a bunch of
references got changed.
Weapon and shield were altered to properly use enums.
Shipyard was started. I'll be finishing it soon, I just need to commit
this so I can see Ian's code.
Merge branch 'master' of https://github.com/vcnickerson/CS2340Project into Connor

Conflicts:
	SpaceTraders/nbproject/private/private.properties
	SpaceTraders/src/spacetraders/InputNameController.java
	SpaceTraders/src/spacetraders/SpaceTraders.java
private.properties stuff

Yep.
I hate this file.
Merge pull request #35 from vcnickerson/Connor

Lots of stuff.