Updated TPS and Completed Task 5 - 7
Merge pull request #1 from poporn/master

Try