slight changes
Conflicts resolved

Merge branch 'master' of https://github.com/gazliddon/blittin

Conflicts:
	Gemfile
	Gemfile.lock
Minor change for this branch