book changed
book modified
Merge branch 'develop' of https://github.com/lk16/squared into develop

Conflicts:
	book/book.csv
Merge branch 'develop' of https://github.com/lk16/squared into develop

Conflicts:
	book/book.csv
book changed
Merge github.com:lk16/squared into develop

Conflicts:
	book/book.csv