first commit
Merge https://github.com/stabone/hardCandy

Conflict