Resolving merge conflict
Merge branch 'release' of https://github.com/fcc/SATFC into HEAD
Fixed README