Basic page redesign
Merge branch 'master' of https://github.com/rcchen/cs210-stockholm

Conflicts:
	app/views/api/explore.html.erb