Merge pull request #11 from egarza54/chat_stuff

chat_stuff
in progress welcome
in progress welcome
in progress welcome
Merge pull request #12 from egarza54/dashboard

Dashboard
fixed merge