initial 2015 commit
Merge branch 'master' of https://github.com/dwoodlock/wff2015.git