Update README
Merge branch 'dev' of github.com:teampopong/pokr into dev

Conflicts:
	README.md
Merge branch 'master' of github.com:teampopong/pokr into dev

Conflicts:
	README.md
Update README
Merge branch 'dev' of github.com:teampopong/pokr into dev

Conflicts:
	README.md