Merge pull request #1 from cs465-crime-busters/hifiprototype

Hifiprototype