Fixing stuff
Merge pull request #1 from BalthazarAIE/First-year

Fixing stuff