Merging with master
Merging with master
Merge branch 'master' of https://github.com/pittsw/Encouragement

Conflicts:
	kenya/patients/static/css/encouragement.css

Trying to merge