Saved a Panamax template ipython_notebook.pmx
pulling in new templates.
Merge branch 'master' of https://github.com/CenturyLinkLabs/panamax-contest-templates
wordpress cluster template
fix typo
rename file name
Saved a Panamax template rails_with_postgresql_and_redis.pmx
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
fixed vbox port mapping in documentation
Saved a Panamax template errbit_andrewcarpenter.pmx
OK.
Added codeigniter mysql template
updating ipython notebook .pmx
updated the documentation.
typo
Create django stack-mysql-mcclanahan