use proper line endings
fixing line endings
remove book output , we dont need it anyway for now
clean up conflicts in geoff's code
cleanup conflicts