made minor changes to titles
fixed conflicts
Added skeleton modules for users, tweets, and db tables, also defined signin route
Merge branch 'master' of https://github.com/rmmccann/CS-326-SmallTalk-Project
didn't really do much