Merge remote-tracking branch 'upstream/master'
Correcting data model to fully integrate core data
Bug fixes
code clean up
Merge pull request #26 from vossgang/matt-copy

code clean up
timeline API change
Merge remote-tracking branch 'upstream/master'
Merge pull request #27 from candyforchris/master

updated timeline api
updated speech controller
Merge remote-tracking branch 'origin/master'
not crashing any more
Merge pull request #28 from vossgang/matt-copy

Matt copy
fixed is edited for textview
Merge pull request #29 from vossgang/matt-copy

fixed is edited for textview
Implementing init methods
Creating init methods for core data
timelineAPI change
Merge pull request #30 from candyforchris/master

timelineAPI change
isrunning bug fixed?
Merge remote-tracking branch 'origin/master'