Merge branch 'master' of github.com:dudevil/GalaxyZoo