Merge work with Jon
Merge branch 'master' of https://github.com/CMPUT301F14T02/TheBrogrammers