* using cmake
* small changes towards running on my Intel4400 or Geforce9800
resolved conflicts
Merge pull request #11 from ulrichard/gpu

Gpu