Merge pull request #1 from gotcha84/enrico

Merging into master: brand new project structure
.gitignore updated for new proj structure
updated gitignore
readded freeglut (why does this keep getting deleted)