Adventure!
Adventure!
some change to test
Merge branch 'introduction' of https://github.com/ilynx/example-basic into introduction
Merge remote-tracking branch 'origin/master' into introduction

Conflicts:
	index.html
Changed the Adventure
Resolved stuff
More Mergings
Merge remote-tracking branch 'origin/master' into introduction

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

some change to test
More merging
Merge pull request #7 from ilynx/introduction

Adventure!
pushing this on my own
Merge remote-tracking branch 'origin/master' into introduction

Conflicts:
	index.html