Updated chapter12.txt
Merge changes from master into DRodriguez_Ranf
formatting
Merge changes from fsarawat into master
Updated chapter9.txt
fixing conflicts
Updated chapter5.txt