merge
Merge branch 'master' of https://github.com/maaqu/Seagull-Burst

Conflicts:
	src/levels.js
Merge branch 'master' of https://github.com/maaqu/Seagull-Burst