v1.1
Merge branch 'master' of https://github.com/mscolnick/DrSearch

Conflicts:
	src/defaultPhoto.jpg