corrected some bits and wrote a bit on the summary
merged the conflicts
fixed a conflict more
one conflict more
Merge branch 'master' of https://github.com/abrj/BAAAP