add lines
add strike
Merge branch 'master' of https://github.com/robotconscience/PxC_Poke

Conflicts:
	Poke/Face.pde