add excuse to net_card
fix bug
Merge branch 'warehouse'

Conflicts:
	db/schema.rb
update .gitignore
add database.yml
Merge branch 'master' of github.com:sundevilyang/ansible into ie7
Merge branch 'ie7' of github.com:sundevilyang/ansible into ie7

Conflicts:
	.gitignore