Merge wireframes into master. Includes a change to the login and SignUp pages