fixed bugs
complete
touch
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	strings/main.go
Most of ls complete