My first commit
Adding in the gitignore file
trying to commit before push to github
Merge branch 'master' of github.com:lionbark/xiaodili