Add mac_os.txt
Merge branch 'master' of https://github.com/davidheryanto/etc

Conflicts:
	ffmpeg-commands
	ffmpeg-commands.txt
	ffmpeg_commands
Add github hook