Update Main.java
Testing Commit
Merge remote-tracking branch 'origin/Matt' into Matt

Conflicts:
	Main.java
Update Main.java
Doing stuff
Merge pull request #3 from MTVaught/Matt

Approved