icon and logo update
done
done
Merge branch 'master' of https://github.com/kalmas/hackuFE

Conflicts:
	app.html