changed gitignore, added conductor_state
Merge branch 'master' of https://github.com/kanto-player/kanto-paper