root
first commit test
Merge branch 'master' of https://github.com/joszer/planningpoker

Conflicts:
	README.md