updating
Merge branch 'master' of https://github.com/KaruroChori/IA2014