Merge branch 'master' into GriffsBranch
Merge branch 'master' into GriffsBranch
Added MongoDB Integration and Profile page
Merge branch 'master' into GriffsBranch

Conflicts:
	client/profile/profile.html
Updates to profile.html
Updates to profile.html
Merge pull request #1 from Collaboratr/GriffsBranch

Merge branch 'master' into GriffsBranch