www sync
Fixed spelling
Merge branch 'master' into develop

Conflicts:
	www/index.html
adsf
adsf
adsf
Changed icon
Merge branch 'develop' of https://github.com/travisrussi/barmix into develop
added logo
Merge branch 'develop'