add
del

Merge branch 'master' of github.com:obalyon/mongo_app

Conflicts:
	app/models/sample.rb