merging
fix merge conflicts
merge with design
logout added
working on message page