git init
sets up ember
fixes conflicts