Adding in GUI files. Updated Makefile to include these in the build path.
Updated .gitignore to exclude Emacs generated files.
Fixing compile errors
Further GUI additions
Merging conflicts
Object changes
Merging conflicts
Merge branch 'master' into gui
Reversing python changes
Merge branch 'master' into gui
Updating Makefile to build
Further GUI work
More GUI features
Merge branch 'master' into gui
Generating vertex and texture data for GUI
Adding windows
Adding rendering support forGUI
Working on setting up vertex data collection
Further additions to GUI
Useful comment on time inaccuracies.
Changed bad return to error.