Merge pull request #6 from AaronGreenberg/master

newest version
changes from now
Merge pull request #7 from AaronGreenberg/master

merged version
Merge pull request #10 from dknip/master

Merging new gui