Add notes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/computation/loader.C
Merge branch 'master' of github.com:bredelings/BAli-Phy