Saved a Panamax template ipython_notebook.pmx
pulling in new templates.
Merge branch 'master' of https://github.com/CenturyLinkLabs/panamax-contest-templates
updating to use my docker file.
Saved a Panamax template ipython_notebook.pmx
updating to use my docker file.
update docks.
merging conflicting updates
Merge branch 'master' of github.com:laprice/panamax-contest-templates

Conflicts:
	ipython_notebook.pmx
fixing syntax of block literal
OK.
updating ipython notebook .pmx
updated the documentation.
typo
Merge pull request #70 from laprice/master

Ipython notebook with numpy, pandas and psycopg2