Deleted stuff I'm not working on
Merge pull request #1 from MatthiasMunder/master

Deleted stuff I'm not working on