upgrade init
Merge branch 'master' of github.com:BookShuffle/bookshuffle.cloud.net

Conflicts:
	.gitignore
	LICENSE
	README.md