ignore /dist and /tmp folders
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
ignore /dist and /tmp folders