edit
Merge branch 'master' of https://github.com/masuilab/interaction2015-paper