Merge pull request #3 from alexanderdavidpan/View

Edited View
Merge pull request #4 from alexanderdavidpan/Nav

Edited Nav Bar
Merge pull request #5 from alexanderdavidpan/Chat_View

Added basic layout for chat view
Added basic layout for profile page
Merge pull request #6 from alexanderdavidpan/Profile

Added basic layout for profile page
Merge pull request #7 from alexanderdavidpan/Chat_View

Added basic layout for chat bubbles using CSS from Bubbler
Bcrypt up and running
Fixed merge conflict in index.rb controller
Merge pull request #8 from alexanderdavidpan/Bcrypt

Implemented bcrypt
Fixed bug where user passwords weren't being encrypted upon creation
Merge pull request #9 from alexanderdavidpan/Bcrypt

Fixed bug where user passwords weren't being encrypted upon creation
Added array of users to seed file
Seed file now creates User entries for Spring Peeper users
Merge pull request #10 from alexanderdavidpan/Seed

Populated seed file
Edited display for friends list
Merge pull request #11 from alexanderdavidpan/Chat_UI

Edited display for friends list
Edited friends list div to scroll down and highlight friends names on hover over
Added function to press enter in the textarea to submit messages.
Added function to dbl click friends in friends list to open up a chat window
Edited chat view and added view friends on profile