fixed conflicts
got ember working a bit!
created a separate page, about
updated node modules, changed grunt to compile sass instead of less