Removed settings file -- causing some issues (will look into it later)
Removed settings file -- causing some issues (will look into it later)
Merge remote-tracking branch 'remotes/origin/master'