Work on navbar and preliminary has_many relationships between users and thoughts
Fixing conflicts