finished updating ui of login
Merge branch 'master' of github.com:alexbrashear/Meditation