Merge pull request #2 from AaronBottegal/master

Don't look at this.
Hello World!
Updated with testing
Beginning work on GUI
Merged Marcus master.
Fix dumb files names.