commitiong for gh pages
added a template
fixed merge confilcts:
Merge branch 'master' into gh-pages
minor changes to instructions
Merge pull request #31 from billy1339/master

minor changes to instructions