MergeConflict running
Merge branch 'master' of github.com:sdluxeon/MyPhoto

Conflicts:
	src/MyPhoto.Entities/NhibernateDescription.txt