added profiling
Merge branch 'master' of https://github.com/UWPCE-PythonCert/Python300-SystemDevelopmentWithPython-Spring-2014