depot scaffold
Validation
Validaation
Validation
Merge branch 'master' of https://github.com/yjcxy12/agileNew

Conflicts:
	.idea/.name
	.idea/modules.xml
	.idea/workspace.xml
	app/views/layouts/application.html.erb
	bin/rails
	bin/rake
	config/application.rb
	config/initializers/session_store.rb
	config/routes.rb
	config/secrets.yml
	db/seeds.rb