First Project Commit
Merge branch 'master' of https://github.com/MarineJ/SMA_Project