Updated chapter12.txt
Merge changes from master into dlegnetto
Merge changes from ckim13 into master
Updated chapter7.txt
Merge changes from JMcCully into master