weight bar shows
fixed goals on profile
fixing merge conflicts
fixed conflicts on profile.jade
Merge pull request #14 from bchiatt/brian

Brian