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

Conflicts:
	lyrics/mobi/templates/base.html