added new content
fixed typo
Updated Address
Merge pull request #1 from dave1980/master

Updated Address
resolved conflict
resolved conflict
Merge pull request #2 from cyanc/master

GH-pages content