Fixing merge conflicts.
Merge pull request #135 from peterasujan/gh-pages

Fixing merge conflicts in order to merge internet lab.