Merge pull request #9 from chorus-frogs-2014/crime_score

Crime score
fixed merge conflict
Merge pull request #10 from chorus-frogs-2014/fix-conflicts

fixed merge conflict
crime jsonp object is not filtered to only include murder,agg assault, robbery, simple assault, alcohol, disturbing the peace (personal victimization crimes)