init
update filters
add movie
add movie model
Merge branch 'master' of github.com:mulderp/movies-thorax

Conflicts:
	.gitignore