added two files
clean
change
change
Merge branch 'master' of https://github.com/EnjoyWorkTrue/Spring2014
deleted two files