nicholalexander/project2 — pull request #17 by JustinGA (2013-11-11 21:07:02+00:00)
Title: Javascript

fixed conflict, questions javascript now only loads on questions index erb