Resolved merge error in schema
Added Posts and Comments
Merge branch 'mybranch'
Merge pull request #23 from rsoto1/master

Merged.