Music experiments; removed graphics
pulled text files from master
experiments
Merge branch 'master' into music

Conflicts:
	Makefile
Added preliminary overlap option for audio
trippy
more fucking around
I think this now sounds nice.
Merge remote-tracking branch 'origin/swing' into motionblur

Conflicts:
	cg2demo.v12.suo
more fuckery
gitignore
Notes via offsets
chords
first stab at motion blur
final touches
Merge branch 'motionblur'

Conflicts:
	fragment_text.glsl
Merge branch 'music'

Conflicts:
	cg2demo.cpp
	cg2demo.v12.suo
Merged movie recording from swing
Fixed whitespace discrepancies
Made recording a commandline option