installed bootstrap
merge for login/register
Merge branch 'master' into front-end
login/registration
merging login
finished login/register ui
working on profile setup
merging front-end
Merge branch 'front-end'
activity model complete
fixed merge issues
message model finished, with sort