added essay and references
removed conflicts
Merge pull request #322 from pdchung/master

fixed conflicts