added spec/application.yml to .gitignore
fixed merge conflicts
Merge branch 'legitTests' of https://github.com/cs169-2013/photo_evidence_gallery into legitTests