still stuck on first try
Merge branch 'master' of https://github.com/nerorevenge/machine-design

because it wouldn'l let be push