removed merge conflict text
fixed goals
Merge pull request #114 from blind-squirrel/alex

Alex