Changed user methods to correspond with the database
Merge pull request #27 from brandonjyuhas/changeUserMethods

Changed user methods to correspond with the database
Merge pull request #26 from Elwend/master

Worked on conditional messages
Add data to index
Merge pull request #29 from brandonjyuhas/add_data_to_index

Add data to index
Fix grammar
Merge pull request #30 from brandonjyuhas/add_data_to_index

Fix grammar
fixing merge issue
Merge branch 'master' of github.com:pmills88/Project-2
Fixed sidebar toggling