Added django to .gitignore
Merge branch 'master' of https://github.com/krsh89/IPRIproj

Conflicts:
	.gitignore