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
Modify travis file to make it work
Change has_many comments association
Added user_id to comment seed
Modify user_id call in query factory
Minor mods to seeds
Comment out test that is doing strange things
Fix merge conflict
Merge pull request #50 from fma2/translate-API

Fix random bugs on language and query show page
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo into comments-TDD
Merge pull request #52 from fma2/comments-TDD

Comments tdd