wercker deploy
Merge branch 'master' of heroku.com:mxit-insults-python

Conflicts:
	insults/mobi/templates/base.html