Fix mouse movement on touchpads... it smells funny. woops
Merge branch 'master' of github.com:UMLComputerGraphics/GraphicsProject
Add makefile that will kick off qmake and real make

Then ignore changes to it