bug fixes with challenges completed
Merge branch 'master' of https://github.com/zettazete/tangelo