db change
Merge branch 'master' of https://github.com/nhat/eb17episodetracker

Conflicts:
	src/main/resources/create.sql