added new files
Merge branch 'master' of https://github.com/lleong/CS274_milestone