fixes
Merge branch 'master' into Kamil
fixes
Merge branch 'master' into Kamil
gemfile edit
conflicts
 ?
Merge branch 'master' of https://github.com/krochmal/memegen
Merge branch 'master' into Kamil
pulling
Merge branch 'master' of https://github.com/krochmal/memegen
pulling
Merge branch 'master' of https://github.com/krochmal/memegen
Merge branch 'master' into Kamil
Merge branch 'master' of https://github.com/krochmal/memegen
Merge branch 'master' into Kamil
fixes to admin
mem add form
Merge branch 'master' of https://github.com/krochmal/memegen
conflicts