merging
Merge Changes
Merge branch 'master' of https://github.com/annynew/fitness_dev

Conflicts:
	src/main/webapp/pages/dashboard/activityFeed.jsp
	src/main/webapp/pages/dashboard/header.jsp
	src/main/webapp/pages/dashboard/profile.jsp
	src/main/webapp/styles/main.css
Added more sections and styles.