Loading image
Conflict resolution
Merge pull request #14 from cts12/feature/simon

Feature/simon