Merge pull request #10 from Rivukis/master

Added Colorizer Class
updated working copy
Merge remote-tracking branch 'origin/master'
Merge pull request #11 from vossgang/matt-copy

updated working copy
Delete project.pbxproj.orig
Merge branch 'master' of github.com:vossgang/captainskittles
dkljf
akjdf
set up isRunning
Merge pull request #12 from vossgang/matt-copy

set up speech is running
TimeLine fixed proportioning system
Merge remote-tracking branch 'upstream/master'
Fixed linker error
Merge pull request #13 from candyforchris/master

Timeline proportioning added
updated the interface
Merge remote-tracking branch 'origin/master'
Merge pull request #14 from vossgang/matt-copy

Matt copy
updated ui display the title card correctly
Merge pull request #15 from vossgang/matt-copy

updated ui display the title card correctly
TimeLine colorizor implemented
Merge remote-tracking branch 'upstream/master'
Merge pull request #16 from candyforchris/master

Colorizor implemented in timeline