added a beer
Merge branch 'master' of https://github.com/williameot/testsystem

Conflicts:
	index.txt