Merge pull request #1 from empirefx/master

Delete, add, modify client
Merge pull request #2 from empirefx/gh-pages

Merge pull request #1 from empirefx/master