Initial commit
First Development version
Fixing conflicts and fixing bg-image