commting gem lock
commit new stuff
Merge remote-tracking branch 'upstream/master'
charts
added ailment delete
added medications controller
added medications controller
gem.lock again
Merge remote-tracking branch 'upstream/master'
Merge pull request #16 from DennisMarcu/master

fixed allergies
Merge pull request #17 from mmoniz/master

Immunization Comments
fixed allergies
deletes
add phr_id_to_medications
fixed merge conflict in schema
commented ailments controller
Merge pull request #18 from AdamAxtmann/master

Ailments comments and some updates to medications
added allergy controller comments
Merge remote-tracking branch 'upstream/master'
Merge pull request #19 from DennisMarcu/master

added comments to allergies