Merge pull request #11 from chutsu/master

This should now be our most up to date, functional CRoPS!
Tinkered with the parameters
Probabilistically fixed
@chutsu RUN THE EXPERIMENTS
Merge branch 'master' of https://github.com/wallarelvo/CRoPS

Conflicts:
	code/boid.py