test commit
Merge github.com:BartStep/Tuts

Conflicts:
	index.php