saver and some of Mike stuff
saver and some of Mike stuff
Merge branch 'master' of https://github.com/ik1nky/451project

Conflicts:
	src/Loader.java
	src/Main.java
	src/Saver.java
	src/objects/Wire.java