final version, waiting for approval.
Merge branch 'master' of https://github.com/acejazz/acejazz

Conflicts:
	presentation.ppt