pool -> pull -> push
Merge branch 'master' of github.com:cr0hn/golismero

Conflicts:
	gui/web/apps/rest_api/urls.py