Merge pull request #1 from iLanguage/master

Merge pull request #28 from MarquisAlx/master
fixes #35
we were missing a result file so the video wasn'T being created.
Merge branch 'master' of github.com:MarquisAlx/OPrime into MarquisAlx-master

Conflicts:
	OPrime-Android-Tutorial/src/ca/ilanguage/oprime/tutorial/OPrimeStorybookExperimentTutorial.java