New Candy fie, and Candy file for hasklig
Merge branch 'origin/master'