first commit
Merge branch 'master' of https://github.com/JohnJoyKurian/jekay

Conflicts:
	settings.py
	urls.py