Answers are now ordered by the number of 'upvotes' they have
Filtered questions by most recently created
Merge pull request #21 from elenasharma/order_answers_by_votes_alisa

Answers are now ordered by the number of 'upvotes' they have
Merge pull request #22 from elenasharma/new_questions

Filtered questions by most recently created
styled login lightbox and questions list
deleted some unnecessary files, centered logo
Merge pull request #23 from elenasharma/actual_styling_do_not_merge_other

Actual styling do not merge other
Can now order answers by newest first
Added link to order answers by vote count
Merge pull request #24 from elenasharma/order_answers_newest_first_alisa

Can now order answers by newest first
Merge pull request #25 from elenasharma/order_answers_by_votes_link_alisa

Order answers by votes link alisa
added scrolling jquery answer form; resolving merge issue with previous branches
Merge branch 'master' of https://github.com/elenasharma/mac_overflow into scrolling_answer_form

Conflicts:
	app/controllers/answers_controller.rb