commit to make it so that I can pull and then merge
Merge branch 'master' of https://github.com/rbpeters/project3_webdev

Conflicts:
	helpers.php~
Checkin of helpers.php and querries.php
merging the branch
Merge branch 'master' of https://github.com/rbpeters/project3_webdev
gibbrish`:wq