First commit from iPad
Merge branch 'green' of https://github.com/edanchenkov/freezing-ninja into green