i broke everything now it is fixed mostly
Merge branch 'master' of https://github.com/rozap/cs410