Useless changes
Merge branch 'master' of https://github.com/pcallier/livingroom

Conflicts:
	scripts/toy-analysis.r
Updated vowel plotting, still tooling around