Merge branch 'kh_info_page' of https://github.com/davidgbe/LinuxBox into kh_info_page

Conflicts:
	Gemfile.lock
	config/routes.rb
Merge branch 'kh_info_page' of https://github.com/davidgbe/LinuxBox into kh_info_page

Conflicts:
	Gemfile.lock
	config/routes.rb
fixed shit