ignore .DS_Store
Merge branch 'master' of https://github.com/stillthesam/cn-videos-shortcodes

Conflicts:
	.DS_Store