[Panda] Something happens!
Merge branch 'master' of github.com:stpddream/BookGen

Conflicts:
	.gitignore
	Vagrantfile
I don't know ==