Add log files to pull changes
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks

Conflicts:
	log/development.log
	tmp/pids/server.pid
Add answer routes
Add answer controller methods, create, new, show, edit, answer_params
Add create new answer to question show
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks

Conflicts:
	app/views/questions/show.html.erb
	log/development.log
	tmp/pids/server.pid
Add create, index and destroy methods to answer model
Add initial parts of likes for answers.
Merge pull request #14 from user1011/master

Add answers
tests for user registration and sign in
question create, delete, upvote, downvote tests
deleted development.log to fix merge conflict
Merge pull request #15 from dylanerichards/master

Tests for users and questions
added "end" to routes file to allow app to start
Merge pull request #16 from dylanerichards/master

added "end" to routes file to allow app to start
fixed link to new answer on question
Merge pull request #17 from dylanerichards/master

fixed link to new answer on question
merged everything