Added bit about BDD, and some other shit
Merge conflicts
Added files