new sync
synced fetch
Merge remote-tracking branch 'upstream/master'
Merge pull request #32 from AdamAxtmann/master

Calendar is added to Appointments
Merge remote-tracking branch 'upstream/master'
fixed bugs in ailments and allergies
fixed a few more small bugs
couple more minor changes
Merge pull request #33 from DennisMarcu/master

fixed several little errors
Changing all models to use Paranoia (instead of deleted column). Also changed add controller and view code to work with new format.
Many small changes, fixes. Adding Admin account with ability to delete users
added image assets, and modified phrs page to have image links