Merge remote-tracking branch 'upstream/master'
Correcting data model to fully integrate core data
Implementing init methods
Creating init methods for core data
kaboom
Merge remote-tracking branch 'upstream/master'
Holy additions!
Fixing bugs after integration
i heart commit
Merge pull request #31 from seanmcneil/master

minor update