Merge pull request #1 from vorenon/master

test commit & deleted config.txt
just changing the port
the one who made all the whitespaces needs a better editor