fixed image thing finally! removed DS_Stores
fixed email stuff
Merge branch 'master' into theme-tweaks

Conflicts:
	.gitignore
	themes/tutor/css/tutor.css
not sure