removed error
Merge pull request #5 from michl2310/master

removed error
doc
Merge branch 'testzweig' of git://github.com/huberthoegl/hsa-oss-demo

Conflicts:
	hello.c
Testzweig gemacht
Merge branch 'testzweig' of git://github.com/huberthoegl/hsa-oss-demo
Merge branch 'master' of git://github.com/huberthoegl/hsa-oss-demo