chnage 500 to 300
Merge remote-tracking branch 'origin/master'

* origin/master:
  change 500 to 404

Conflicts:
	app.js