Com
Com
Thumbs
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	img/Thumbs.db

	modified:   .gitignore
	modified:   css/style.css
	modified:   sass/_common.scss