first commit
gitkeep
delete gitkeep
Merge branch 'master' of https://github.com/focalhot/etool.git

Conflicts:
	assets/js/app.js
	protected/views/goods/edit.php
	protected/views/layouts/app.php