added win32 to makefile
Merge branch 'master' of https://github.com/jonasstrandstedt/infvisGL
Added assert