Template files updated by Justin
initial commit, working on login page and reset/remind password
Merge branch 'master' into william
Merge branch 'master' into william
Merge pull request #8 from areveal/william

William