Integration code
combin
Merge branch 'master' of https://github.com/normanchoo/hack2014

Conflicts:
	client/index.html