925 pre7/6
925 7/6 pre
Merge branch 'master' of github.com:eliteGoblin/cpp_primer
7/6 afternoon