created Option model, controller, views, basic tests
merged options