Avance
Merge branch 'master' of https://github.com/martinzh/JuliaFlocks

Conflicts:
	DataAnalysis.ipynb