Simple Login Page
Merge branches 'domenic' and 'master'
Merging heather's branch
Finish 2 features