A new beggining
Merge branch 'master' of https://github.com/PetyaPanayotova/book

Conflicts:
	book.txt