Merge branch 'master' of https://github.com/sharonlin/ad4u

Conflicts:
	public/index.html
	public/js/app.js