remove simplejson
fake edit in 404.html and added DS_Store in gitignore
Merge pull request #6 from nikolas/remove-simplejson

remove simplejson
Merge branch 'master' of https://github.com/ccnmtl/wardenclyffe into ui-enhancements
Merge pull request #7 from zmustapha/ui-enhancements

fake edit in 404.html and added DS_Store in gitignore