ad our solution
merging branches
cleaning up mess, putting stuff for site in one clean folder, hopefully not ruining everything.