Showing images in time with audio
sample1 json
Merge branch 'master' of https://github.com/mgomov/studybuddy

Conflicts:
	main/studybuddy/sample1/sample1.json
	main/studybuddy/studybuddy.html
	main/studybuddy/studybuddy.js