adding template for privacy policy
Merge pull request #1 from AdamAxtmann/master

Ailments and Immunizations
model implemented for eyes
Merge branch 'master' of https://github.com/AdamBrousseau/Capstone into eyes

Conflicts:
	app/models/phr.rb
	db/schema.rb
Almost done eye controller. TODO:adding all fields to eye form
small change to routing after eye update
phonebook implemented
phonebook controller added
Update .gitignore
Update .gitignore
gemfile ignored
modified gitignore
Merge branch 'master' of https://github.com/forkbattery/Capstone into forkbattery-master

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/_footer.html.erb
	config/routes.rb
	db/schema.rb
finishing phobnebook merge
..