Add episode
Add conditions
Merge branch 'master' of https://github.com/TheCastleOfGoblins/SwordsAndBooks

Conflicts:
	swordsAndBooks/app/models/episode.js
	swordsAndBooks/config/router.js