dupa
:Merge branch 'master' of https://github.com/webster58/hackathon_pingwin

Conflicts:
	hack/static/js/config.js