changes
Merge branch 'master' of https://github.com/adamfur/GifJam

Conflicts:
	pack.sh
per tab enabled