makefile change
Merge branch 'master' of https://github.com/erikhaq/particles

Conflicts:
	.gitignore