Changed "Goals" to a list
Merge remote-tracking branch 'origin/master'