more integration
Merge branch 'master' of https://github.com/rbpeters/project3_webdev

Conflicts:
	helpers.php