Putting things in place and checking for broken functionality before merge
Merge branch 'educational' of https://github.com/moloch--/RootTheBox into educational