Messy commit, not working yet
Merge branch 'master' of https://github.com/michaelchum/shows-alert

Conflicts:
	shows.db