changed test.txt
Merge branch 'joshtest' of https://github.com/GiangNguyen94/simpleRESTShopping into jack_v0.1
change name app.js