Created basic Ember App
Manual merge