Merge branch 'Noah' into Development
Merge branch 'Noah' into Development
Merge branch 'Noah' into Development
Minor revisions as suggested by elaine
More minor changes
Signed-off-by: Planetaryn <Planetaryn@gmail.com>
Added Relays
Added some actual programming to show how things are going to work
(required for compilation)


Signed-off-by: Noah Goldsmith <Planetaryn@gmail.com>
Added Shmuels ne Class Disk.
Added save method to Main
Changes
n
Updated GUI
Made changes reccomended by elaine
Minor Changes
Minor Change
Changes
Blah
Minor changes
Change suggested by Kelly
disk changes
Merge branch 'Noah' of https://github.com/Planetaryn/ContactList into
Noah

Conflicts:
	src/ContactList.java
	src/Disk.java
	src/GUI.java
	src/Main.java
GUI & Main updates