Merge branch 'gh-pages'
Updates to Front and Back End
Merge branch 'master' into gh-pages