Merge branch 'master' of https://github.com/quirkles/tvtrakr
Update 404 page
Merge branch 'master' of https://github.com/quirkles/tvtrakr