new file:   Projects_All.pdf
	new file:   ajaxQuery.php
	modified:   footer.php
	modified:   images/SmartKitchen.png
	new file:   images/goback.png
	new file:   images/view.jpg
	new file:   images/view.png
	modified:   index.php
	modified:   left.php
	modified:   library/config.php
	modified:   library/database.php
	modified:   library/functions.php
	modified:   library/inventory.js
	modified:   library/user.js
	modified:   login.php
	modified:   main.php
	modified:   menu.php
	modified:   mymenu.php
	modified:   shoplist/history.php
	modified:   user/add.php
	new file:   user/history.php
	modified:   user/list.php
	modified:   user/processUser.php
	modified:   vendor/add.php
	new file:   view.jpg
	modified:   view.php
	new file:   view.png
Merge branch 'master' of https://github.com/HongbiaoYang/SmartKitchen

Conflicts:
	library/functions.php
	login.php
	main.php
	mymenu.php
	user/processUser.php

	modified:   library/functions.php
	modified:   login.php
	modified:   main.php
	modified:   mymenu.php
	deleted:    socketCln.php
	deleted:    socketSrv.php
	deleted:    socketUDP.php
	modified:   user/processUser.php
	modified:   library/functions.php
	modified:   login.php
	modified:   main.php
	modified:   mymenu.php