pull down master
Merge branch 'master' into brian
user and goals forms updating now
merge conflict resolved
Merge pull request #12 from bchiatt/brian

Brian