before pull
Merge branch 'master' of https://github.com/rihtak/aquastar

Conflicts:
	.idea/workspace.xml