Revising README
Revising answers to include more detail
Fixing merge conflicts