finished Cambridge book
updated lecture slides and readme
new test R file
equations section 4.4 working!
updated to keep fractional weights
small edits & typo fixes
Merge pull request #3 from dataknut/master

updated to keep fractional weights
updated book
Merge branch 'master' of github.com:Robinlovelace/spatial-microsim-book
updated CakeMap.R
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	book-cambridge.Rmd
update of book (shorter)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.md
	book-cambridge.Rmd
Hopefully this'll sort it! Merge with upstream
Merge remote-tracking branch 'upstream/master'

Conflicts:
	book-cambridge.Rmd
fix readme file
Merge pull request #4 from philmikejones/master

Merge in Phil's sensible changes - good plan
fixed readme
Merge pull request #5 from philmikejones/master

fixed readme
added fractional_weights code & updated course notes