Removed tpfahp and added twfahp
Merge branch 'master' of https://github.com/fhaynes/cs6310-project1