new file:   .gitignore
new file:   server/Makefile
new file:   server/compare.cpp
new file:   server/photos/image1.jpg
new file:   server/photos/image2.jpg
new file:   server/photos/image3.jpg
new file:   server/photos/image4.jpg
modified:   .gitignore
modified:   server/compare.cpp
new file:   server/compare
modified:   server/compare.cpp
modified:   server/photos/image2.jpg
renamed:    server/photos/image2.jpg -> server/photos/image5.jpg
Merge branch 'master' of github.com:horosgrisa/CV.md

Conflicts:
	.gitignore