main_screen & profile_screen
Merge branch 'master' into lumin
main screen layout finished
updated registration
Merge branch 'master' into derek
update