Steps 1-6
Merge branch 'master' of https://github.com/Noaniels/Swiftris