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

Timeline proportioning added
Merge remote-tracking branch 'origin/master'