Merge pull request #13 from jsuit/experimental

Experimental
Merge pull request #15 from wesleyeewong/master

add admin feature
Merge branch 'experimental'

bringing experimental into master
4/14
Merge pull request #23 from jsuit/master

j