Started the annoying server
Minor changes
Merge pull request #2 from aweesomo/branch1

Branch1