Changes to make the project work across development environments.
Merge branch 'master' of https://github.com/tjvantoll/GifThyself.git
Merge branch 'master' of https://github.com/tjvantoll/GifThyself.git

Conflicts:
	GifThyself/.abproject