Merge branch 'master' of github.com:kopipejst/gifeeno

Conflicts:
	javascripts/gifeeno.js
max frames
Merge branch 'master' of github.com:kopipejst/gifeeno