Merge branch 'master' of https://github.com/sydneyliu/BuildCamp-July-2014

Conflicts:
	browse.html