CMPUT301F14T14/Project — pull request #101 by lamorie (2014-11-08 01:29:49+00:00)
Title: Fixed merge conflicts, deleted add answer button

We dun fucked up, but then we fixed it!