Final Pushes
Merge branch 'master' of https://github.com/kdvoisin/NeohackMacysEvents

Conflicts:
	images/EventsHeadersmall.jpg