Merge pull request #4 from funvill/master

More Gui Stuff
server commits
merged
git ignore