login button
Merge branch 'eddie'