- Basic image context in collage 1
Merge remote-tracking branch 'origin'
- Fixed login bug