Fixed Conflicts

Rails is now working as expected
Merge pull request #189 from ndomar/C3S3_AddQuestion

Fixed Conflicts