Merge pull request #1 from CY-Chan/master

Start simulateData
Merge pull request #2 from CY-Chan/master

Add pi function and CCP estimates
Put in f
Merge pull request #1 from mattybeam/master

Put in f