strange things be happening
git Merge branch 'Cole' of https://github.com/CMPUT301W14T10/Team-10-Project-W2014