deleted

deleted
.

.
Merge remote-tracking branch 'origin/master'

Conflicts:
	mac_man/index.html