gitignore update
Hagerman Code (from Wu)

Original Hagerman code estimation from Wu.
Sound playback loop in psychotoolbox
scaffold for playvideo
Merge branch 'master' of https://github.com/cwbishop/Projects

Conflicts:
	.gitignore