Merge pull request #50 from kaplanoah/master

Removed merge conflicts
tried to change css for presentation
Merge pull request #51 from gthetwong/master

tried to change css for presentation
updated readme