git
Merge branch 'master' of https://github.com/Master-Machines/Master-Machines.github.io

Conflicts:
	Master-Machines.github.html

fdf