change fps to 20
Merge branch 'master' into chihiro_testing

Conflicts:
	source/global.h
Merge remote-tracking branch 'origin/master' into chihiro_testing

Conflicts:
	testprogram
change camera angle
change ip configuration to the external file
Merge remote-tracking branch 'origin/chihiro_testing'

Conflicts:
	testprogram
fix attack6
fix effect