Changes
All
new logo
Merge branch 'master' of https://github.com/avinashghare/thorat

Conflicts:
	config.xml
	templates/photos.html