Homepage changed
Merge git://github.com/RaffiHsieh/410project into cookle

Conflicts:
	app/views/test/home.html.haml
home page changed
Search page finished
Search page done