test commit 4
Merge branch 'master' of github.com:nekjine/conference

Conflicts:
	index.php