Initial Commit
Updated files
Merge pull request #1 from Febby/master

Merge master with gh-page