modal window
fixing merge conflict
add countries partial
add countries partial
Merge pull request #19 from dmitryshilin/go-go-go

Go go go
fixing conflict
Merge pull request #21 from dmitryshilin/order_controller

Order controller
fixing conflict
Merge pull request #20 from dmitryshilin/country_partial

Country partial
elasticsearch added
cancan added