Added glm to requirements
Merge branch 'master' of github.com:bkloppenborg/simtoi
Merge branch 'develop'
Patches to simtoi for OSX
Merge pull request #75 from matdander/master

Patches to simtoi for OSX
Merge branch 'develop'
Fixed merge conflicts.
Merge branch 'develop'
Fixed merged conflict with README
Added text discussing the status of Intel HD/Iris graphics.