foobar
Merge branch 'master' of https://github.com/vimota/goldfish

Conflicts:
	main.js
Merge branch 'master' of https://github.com/vimota/goldfish