changed read me
conflicts
merging
fixed front page and profile page format