Creating template
initial commit
drag images and persistence
Merge branch 'master' of ssh://nl2-hlrvl.rhcloud.com/~/git/nl2
Merge branch 'master' of github.com:hlopes/MapMyPhotos

Conflicts:
	.gitignore