Background
Merge branch 'master' of https://github.com/Acaldas/LAPD

Conflicts:
	public/movies/views/main.html