test
test
Merge remote-tracking branch 'origin/realAPI' into test

Conflicts:
	app.js
test 2
test 2
test 2
test 2
add hardkod to image
add hardkod to image
Merge branch 'test'
icon move