everything before the last push
Merge github.com:sakoh/ember_front_end