add assets
let there be light (add sun)
initial merge