added validation for tpn calculation
changes in tpn view
Merge branch 'development' of github.com:joshsoftware/kimayaTPN into development

Conflicts:
	app/controllers/tpns_controller.rb
marking dates on calendar
Merge branch 'development' of github.com:joshsoftware/kimayaTPN into development
Merge branch 'development' of github.com:joshsoftware/kimayaTPN into development
fixed the css
adding modal for tpn calculation
Merge branch 'development' of github.com:joshsoftware/kimayaTPN into development

Conflicts:
	Gemfile.lock
	app/controllers/tpns_controller.rb
	app/models/tpn.rb
	app/models/tpn_infusion.rb
	app/views/application/_header.html.haml
added new method in tpns controller
build passing after merging
trying again for circleci
changed tpns controller
configured seed file for circleci
added circle.yml
changed circle.yml
modified circle.yml