fixed singin/signup conflict
Merge pull request #54 from JoshFB/button_update

fixed signin/signup conflict