Fooled around with photos from a network location
Merge branch 'master' of https://github.com/floquation/CollageMaker

Conflicts:
	.gitignore