Cleaned up price additions, stopped displaying default values of computer
Cleaned up price additions, stopped displaying default values of computer
Merge branch 'master' of https://github.com/mem-comp4081-2014fall/comp_app

Conflicts:
	app/controllers/component_pages_controller.rb