Merge pull request #1 from Grimmes/markup

create markup
Create basic Stuff
Begin user service work
Include user service
Include Message Service
create style
merge mlcalvaria
Update markup