leave join func
Merge branch 'homeScreen' into development
control commit to push