Merge branch 'master' of https://github.com/skanjarkar/imgtovideo
Added audio functionality
Merge branch 'master' of https://github.com/skanjarkar/imgtovideo
Added Audio recording, added audio and video merging/converting to mp4, though it is not working as expected. convertStreams() function is taking audio and video blobs, reading those files is fine but after that while merging it is giving error.
Merge branch 'audio'

Conflicts:
	app/views/welcome/create.html
	app/views/welcome/index.html.erb
1.Loading images from desktop and displaying  as thumbnails 2.Added close button to image 3.Recording audio 4.Recording video5.Performed code modularization
Merge remote-tracking branch 'origin/master'