Message
Merge branch 'master' of https://github.com/michaelchum/shows-alert

Conflicts:
	shows.db
	static/js/rango-ajax.js