noone needs . and .. as a subdirs
Merge remote-tracking branch 'origin/master'