Added Added electron simulator - very buggy still
Merge branch 'master' into gh-pages