add two files
Merge branch '20140907_fe_first'