Commit #5 Test Folder
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
Commit #6 Test Folder
Commit #7 Test Folder
Merge remote-tracking branch 'origin/master'