Removed unnecessary directories.
Merge remote-tracking branch 'origin/master'
Nothing really important, just a test for egit...