Merge pull request #11 from jdpagley/master

Fixed Merge Conflicts and split sermonAddEdit into two separate files.
Updated checkIns.ejs page
Merge pull request #12 from japagley/master

Updated checkIns.ejs page
Fixed merge conflicts and completed checkins functionality for portal.