ALL THE MERGES!
Merge remote-tracking branch 'upstream/master'
Testing keyword search
Revised DSCard
Merge pull request #4 from seanmcneil/master

Revised DSCard, building keyword search functionality
Working on test case
Bug fixes on data controller, speech lookup working in test
Merge pull request #5 from seanmcneil/master

Updated data controller, sucessfully creating/querying speech from store
testing vertical stack for keyword search
TimeLine formatting error
refactor
Merge remote-tracking branch 'origin/master'
Merge pull request #7 from vossgang/matt-copy

Matt copy
Merge remote-tracking branch 'upstream/master'
Merge pull request #8 from candyforchris/master

Fixed Timeline AutoLayout
Implementing keyword search method
Added point sequence, implemented method into search controller for keywords. Will fix all caps search, then implement title search
Merge remote-tracking branch 'upstream/master'
Merge pull request #9 from seanmcneil/master

Added point sequence, keyword generation in place
hopefully fixed merge conflict