Modify seeds file to ready for pagination work
Merge branch 'master' into paginate-welcome
Remove oauth tests, fix home page test
Add tags integration test for welcome page
Merge branch 'master' into paginate-welcome

Conflicts:
	spec/features/welcome_integration_spec.rb
added dynamic question form
added ajax detection for progressive enhancement
added a class to the search form in order to target it, so that the question form could be added before it
Merge branch 'master' into ajaxify_questions
Add user_id to voting up and down functions
Merge pull request #25 from tarynsauer/ajaxify_questions

Ajaxify questions
Remove follow links for question author
Merge pull request #26 from tarynsauer/follow_links

Remove follow links for question author
Add ajax to voting
Merge branch 'master' of https://github.com/tarynsauer/ask_deebs
working on ajaxifying answers still
Merge branch 'master' into follow_links

Conflicts:
	app/assets/javascripts/questions.js
	app/controllers/answers_controller.rb
still working on ajaxifying answers....
Update and rename README.rdoc to README.md
Update README.md