Fixe FS / SD file global definition conflict#82

Open

pfeerick wants to merge 2 commits intodigistump:masterfrom

pfeerick:FS-SD-file-conflict

Commits on Apr 9, 2017

Fixes FS / SD file definition conflict
pfeerick
committed

Commits on Apr 10, 2017

Rolling back some additions form last commit
pfeerick
committed