added user edited
Merge pull request #20 from vossgang/matt-copy

added user edited
Merge remote-tracking branch 'upstream/master'
Merge pull request #19 from seanmcneil/master

pull all the code
add current speech collectionability to move cards by long hold and move
Merge pull request #21 from Rivukis/master

add current speech collectionability to move cards by long hold and move
stuff
Merge remote-tracking branch 'origin/master'
implemented LXReorderableCollectionViewDataSource for cleaner code
Changes Made to UI
Merge remote-tracking branch 'upstream/master'
words
Merge pull request #22 from vossgang/matt-copy

Matt copy
merge conflict resoleved
Merge remote-tracking branch 'upstream/master'
Merge pull request #24 from Rivukis/master

implemented LXReorderableCollectionViewDataSource for cleaner code
PLEEESE MERGE
Merge remote-tracking branch 'upstream/master'
Merge pull request #25 from candyforchris/master

PLEEEEESSEE
Correcting data model to fully integrate core data