created grid class
Merge branch 'master' of https://github.com/lilisun/hair

Conflicts:
	src/pendulumSystem.cpp