Changed files to reflect filename change.
Changed files to reflect filename change.
Merge branch 'master' of /home/tynach/Documents/Dry

Conflicts:
	public/test.php