fix merge
Merge branch 'master' of github.com:pmills88/Project-2
Merge branch 'master' of github.com:pmills88/Project-2
Merge branch 'master' of github.com:pmills88/Project-2
Merge branch 'master' of github.com:pmills88/Project-2
Merge branch 'master' of github.com:pmills88/Project-2
Merge pull request #36 from pmills88/SideBar

Functioning Sidebar Ala Jesse
Merge branch 'master' of github.com:pmills88/Project-2
Set up Messages
Merge pull request #37 from brandonjyuhas/edit_messages

Set up Messages
add background colors
Merge pull request #38 from sneubig/addStyles3

Add styles3
Working Sidebar