initial added
Merge branch 'master' of github.com:pyarun/djfabconfig

Conflicts:
	.gitignore