Initial commit
Merge branch 'gh-pages'
minor updates
Merge branch 'gh-pages' of https://github.com/nkgrewal/erica-jorgensen into gh-pages