add some model
add paperclip
fixing something
fixing merge conflict
Merge pull request #13 from dmitryshilin/active_admin

Active admin