Added comments, got rid of custom extensions.
Merge branch 'master' of /home/tynach/Documents/Dry

Conflicts:
	public/test.php