Added the two files that are needed by Git.
Merge branch 'master' of github.com:DanielLin1986/dev_1