This is an ugly commit with a lot of broken files.
Merge branch 'master' of https://github.com/oliveratutexas/FREGE