Merge pull request #13 from elenasharma/Tali_nick_fix_shit

Tali nick fix shit
Added better index
Merging branch, is this working?
Merging the most recent version of master...
Merge pull request #14 from elenasharma/bcrypt

Bcrypt
Can render responses on the page via AJAX. Also got rid of 'phanton' answer that was skewing everything.
Merge pull request #15 from elenasharma/implement_responses_alisa

Implement responses alisa
Changes all specific responses to have their own container rather than one for every single response
styled index and forms
Responses are now added to their corresponding answer box and not to all the answer boxes
Full cycle of responses is complete. Can now add a response, have the form disappear, and appear again when done adding the response
Merge pull request #16 from elenasharma/implement_responses_alisa

Implement responses alisa
testing questions controller #index action; questions#show tests not working.
merging to have most updated version; only 2 tests passing still (question#index)
Merge pull request #19 from elenasharma/new_questions

New questions
merging styling branches into one
Merge branch 'master' into actual_styling_do_not_merge_other

Conflicts:
	app/assets/stylesheets/layout.css.scss
	app/assets/stylesheets/questions.css.scss
database reset to resolve password salt issue
Merge pull request #20 from elenasharma/resolved_styling_merge_conflicts

Resolved styling merge conflicts; merged Tali's styling work
Merge pull request #18 from elenasharma/controller_testing

Controller testing
Filtered questions by most recently created