merge conflict fix
 merge fix
Merge branch 'steve'
fix crash
Merge branch 'steve'
fixed bug
log out works