moving profile page and login page to master

Doing this mainly to work with Grace in getting our stuff combined.