fixed some little bugs
Merge branch 'master' of https://github.com/TripletsGameViope2014/triplets