Minor changes
fixed gitignore
Moved main
Initial Commit
Merge pull request #1 from Planetaryn/master

Test
Merge pull request #2 from Planetaryn/Shmuel

Merge pull request #1 from Planetaryn/master
Merge remote-tracking branch 'origin/master' into Irma
Name and StreetAddress added
Merge remote-tracking branch 'origin/Irma' into Noah

Conflicts:
	src/GUI.java
	src/Main.java