Merge pull request #1 from AhmedMessaoudi/dev

test pull request
Adding super cool feature
Merge pull request #2 from kaiwa/supercool-feature

Adding super cool feature
bugfix
Merge branch 'dev'

Conflicts:
	index.php
bugfix2
bugfix2