Merge pull request #22 from allanmonzon/master

makes changes
Profiles have been mostly styled
small tweaks
working on chat
fixes conflicts
minor changes