made changes to the forma nd background
Merge branch 'master' of https://github.com/ExtraordinaryJerks/nashtaag

Conflicts:
	views/editTaag.jade