gallery implemented
gallery implemented
conflict resolved
conflict resolved
conflict resolved
Merge pull request #30 from emocentmagar/krazz

Krazz