Added Plan model
Added Plan database seed values
Generated subscription resources. Ran migration to create table
Created associations between user, plan and subscription models
subscription form and create action
changed column type of first_delivery_date to date
subscription show view
migration after master pull
Merge branch 'master' into subscriptions

Conflicts:
	config/routes.rb