Final changes to SPI project
Merge branch 'master' of https://github.com/epicpants/EmbeddedSystems
Fixing merge conflicts