some change to test
Merge remote-tracking branch 'origin/master' into introduction

Conflicts:
	index.html
Merge pull request #9 from xurion1/introduction

some change to test
More merging