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
Merge branch 'develop' of https://github.com/lk16/squared into develop
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~
	src/book/book.cpp
	src/util/math.hpp