nicer title
Merge branch 'master' of https://github.com/csikosjanos/githubtest

Conflicts:
	index.html