Uploading my progress for review tomorrow in group meeting
Merge branch 'master' of https://github.com/norealskill/FLATS