checking out from master
added RUD and color tags
changed
11,sally,none
11,sally,none
11,sally,none
Merge branch 'gaurav'

Conflicts:
	.gitignore
	inpica/settings.pyc