organizations
Merge branch 'master' of https://github.com/jelicich/pet-magick

Conflicts:
	js/lib.js