.gitignore
Merge branch 'master' of https://github.com/jamesyuch/infra_project.git

Conflicts:
	.gitignore
Modify the XML reader