updated server code and began adding tests
update project and added some tests
Merge remote-tracking branch 'upstream/master'
Completed services functionality on settings page
updated Posts and comment functionality and models. Posting and commenting is complete
started developing code for the sermons
Fixed merge conflicts
Merge pull request #8 from jdpagley/master

Fixed Merge Conflicts