changed paul and feinstein back
Merge branch 'gh-pages' of https://github.com/jtremback/ndaa2012.us into gh-pages