yayy finally got shit workkiiing
Merge remote-tracking branch 'git/master'