added rspec tests 4 passing
added controllers and form to question
begin testing controllers
fixed merge conflicts
merged mored damn conflicts