commit 9/12/14
Merge branch 'master' of https://github.com/johnmans/EnTax