Adds ember starter kit
Fixes conflicts