Remove .idea
Merge branch 'master' of github.com:jkanethird/sample_app
Merge branch 'sign-up'
Merge branch 'master' of github.com:jkanethird/sample_app