Initial ember set up.
Fixed merge