Added collision manager
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/processing/Main.java
Merge pull request #1 from itokonnyaku/master

CollisionManager の枠組み構築