Update README.md
Added upvote/downvote functionality for answers
Merge branch 'master' of https://github.com/user1011/stacksonstacks
Merge pull request #13 from vivekmgeorge/master

Merging my changes to the master branch
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks
add answer upvote/downvote links to show
Removed cache
Fix merge conflict with route
Merge branch 'master' of https://github.com/red-spotted-newts-2014/stacksonstacks

Conflicts:
	app/views/questions/show.html.erb
	config/routes.rb
	tmp/cache/assets/development/sprockets/067302be7fc4e929ed234394d639bf22
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/22516fd1f9daf04ec4b5ac994781f40f
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/45ae2cda73f7044541a58f64564df62e
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
Delete irrelevant code
Merge pull request #18 from user1011/master

add new page for answers, up/down votes
merged changes