UTF-8
Merge branch 'develop' of github.com:FOSSRIT/lemonade-stand into develop