Beta ta Similar Computers
Merge branch 'similar_computers'

Conflicts:
	config/routes.rb