charts
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
Adding comments to UsersController
Removing unneccesary assests
Fixed error render message when trying to create invalid record
Documented
Merge pull request #20 from forkbattery/master

Documented code
Merge branch 'master' of https://github.com/AdamBrousseau/Capstone

Conflicts:
	app/controllers/tests_controller.rb
Commented Controller code for Users, Phrs, eyes
Commented Controller code for session
added more comments
Merge pull request #21 from DennisMarcu/master

holy crap, sorry this is so late
made ailments prettier and more functional