Cleaning up files and removing stuff that does not belong
Merge remote-tracking branch 'origin/master'