dsa
Merge branch 'master' of https://github.com/ninadang/ninadang

Conflicts:
	img/back/Thumbs.db