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