Fixed up stuff that got messed up

I either reverted back to the wrong commit and lost progress on the
functionality and the gui so I fixed it, this is the newest version as
of now
Merge pull request #4 from brandonwang15/Working-Branch

Fixed up stuff that got messed up