StockList test cases passed.
Merge branch 'master' of https://github.com/wenhanwu/525hw01

Conflicts:
	525hw01/src/com/api/AdminAPI.java
	525hw01/src/com/api/UserAPI.java