Clear Upload
	modified:   .gitignore
	modified:   kenya/kenya/settings.py
Merge branch 'master' of https://github.com/pittsw/Encouragement