make openmp optional
remove .m
update .nb
video script
run script
gitignore
Merge branch 'master' into mac

Conflicts:
	.gitignore