FIX ALL THE THINGS
Merge branch 'master' of github.com:rnagle/chicagocrime

Conflicts:
	templates/summary.jst