Merge pull request #1 from sharktank-bic/master

test pull
Delete fermi.m~

.m~ file, not needed
Merge pull request #1 from iveslevesque/master

test pull request after file deletion