stufffff
Probably removed the conflictz
Insanity
Merge remote-tracking branch 'upstream/master' into vb653
Fixed Lines going underneath upload button, and more bugs
Merge remote-tracking branch 'upstream/master' into vb653
Merge pull request #683 from balabhv/vb653

Fixed lines going under upload button
Spinner implemented for recording length in Car Ramp Physics v2
Merge remote-tracking branch 'upstream/master' into vb682
Merge pull request #684 from balabhv/vb682

Spinner for recording length working
renamed files
Merge remote-tracking branch 'upstream/master' into nuHamster
Merge pull request #685 from jaypoulz/nuHamster

Renamed some files so that everything is named consistently and removed old logos.