Introduction branch

Contains the login branch changes James made and that Audrey merged into this branch.