Committing a change
Merge pull request #19 from coreyshaffer/bug-r

Committing a change
Merge branch 'master' into bug-t

Conflicts:
	sample.php