started project
bundled and bootsrtraped emberjs
merge conflict in .gitignore