First commit
Merge https://github.com/cegagnevin/php-project-02-2013

Conflicts:
	README.md