last push
Remove migration ...
Merge branch 'master' of https://github.com/xssoftware/defend-the-order

Conflicts:
	config/environments/development.rb
	db/schema.rb
Merge branch 'master' of https://github.com/xssoftware/defend-the-order