readded as4.sln
readd as1
Merge branch 'surface-and-opengl' of https://github.com/h-wang94/cs184final into surface-and-opengl
added tension force
Merge branch 'surface-and-opengl' of github.com:h-wang94/cs184final into surface-and-opengl
added openmp
was trying to parallelize creating particles but seg fault so nothing
changed
Merge branch 'surface-and-opengl'

Conflicts:
	as1.vcxproj