deleted everything but landing page
deleted html forms
merge conflicts addressed
changed index to password
Merge branch 'gh-pages'