bug fixing

modified:   pong.erl
now  compiles again

modified:   pong.erl
Merge branch 'master' into dev

Conflicts:
	src/pong.erl