B1

v-1.0
---
1. Scaffold => Done
2. Routing => Modified
B2

v-1.0
---
1. Scaffold => Done
2. Link => Added
Merge branch 'B1_SCAFFOLD_Text'

Conflicts:
	config/routes.rb
	db/schema.rb
	win_command_history.txt