fixes
Merge branch 'master' into Kamil
fixes
Merge branch 'master' into Kamil
 ?
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
Merge branch 'master' of https://github.com/krochmal/memegen
Merge branch 'master' into Kamil
fixes to admin
fixed views,admin
 no working
working now
costam
costam
got rid of the nasty border
Merge branch 'master' of https://github.com/krochmal/memegen
conflicts