Merge branch 'master' of github.com:ChooChooo/I-want-an-iPad

Conflicts:
	app/views/search/_search_results.html.erb
	app/views/search/search.html.erb
Merge branch 'master' of github.com:ChooChooo/I-want-an-iPad