+simulator bone;
Merge branch 'master' of github.com:xZise/ProjectF

Conflicts:
	.gitignore