added my name
Merge branch 'master' of git://github.com/G12/MAD9135 into G12-master

Conflicts:
	README.md
Merge branch 'G12-master'