Mod .gitignore
Merge branch '20141013_kodama'
Merge branch '20141013_kodama'