added a refenrece in litterature and corrected hundred word
fixed a conflict
Merge branch 'master' of https://github.com/abrj/BAAAP