Stylistic modifications
Merge branch 'master' of https://github.com/ktaletsk/gpu_dsm

Conflicts:
	.gitignore
	main.cu