backed up before commit seven thirty
Merge branch 'master' into three-pm-version
adding controller logic
Merge pull request #6 from Databates/three-pm-version

Three pm version