pull down master
Merge branch 'master' into brian
user and goals forms updating now
merge conflict resolved
fixed conflicts on profile.jade