clean up views and fix modals to show signin and signup
clean up application controller that was used for testing
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
working with user auth
is this commit working?
change merge conflicts
Merge pull request #49 from juljun14/master

fix users and views
Fix merge conflict