Added settings.xml
Merge with remote master
Revert "Merge branch 'master' of github-ckfisher:ckfisher/FDM_Client"

This reverts commit e25a5e0575615406ec87c650a01a97da53fb0e46, reversing
changes made to db72611d6db03bc4ad6d3ddbff20ba8971c62e3e.
Fixing bad changes