Add thermostat
Show the conflicts!

Merge remote-tracking branch 'upstream/master' into test

Conflicts:
	examples/argon_108.inp
	src/ljmd-cl.c
	src/opencl_kernels.cl
modify argon_108.inp
upload file for ignorance
make change to ljmd-cl.c
add change with inp file in examples folder
changing input file for <make test> working
Delete argon108 file in main dir
Merge remote-tracking branch 'upstream/master' into morse

Conflicts:
	.gitignore
change program for <make test> working
Merge pull request #34 from tranpduy87/master

Adding thermostat: Hoover Nose / Velocity Rescaling / Berendsen

Task for next project to implement a test suite to control for stability of the methods