No changes here.
Merge branch 'master' of https://github.com/chickendiver/CMPUT291W2014P1
Started work on violation record
Merge branch 'master' of https://github.com/chickendiver/CMPUT291W2014P1