Merge pull request #1 from p2pu/gh-pages

Merging updates from main project
added instructions for merging upstream changes via github
Fixed some formatting

and a typo
Forgot the images...

they're kind of importnat
Merge pull request #32 from TheHaverchuck88/gh-pages

Instructions for merging upstream changes through GitHub