more on ignore
Merge branch 'master' of https://github.com/Lefthandmedia/Smaaktest5

Conflicts:
	.gitignore
some photo deletes