Merge remote-tracking branch 'origin/legitTests'
Merge branch 'master' of https://github.com/cs169-2013/photo_evidence_gallery
Merge branch 'master' of https://github.com/cs169-2013/photo_evidence_gallery
cuke and spec are green