Temp commit
Temp commit 2
Merge branch 'development' of https://github.com/DCUnit711/ep into development

Conflicts:
	app/models/computer.rb
	app/models/inventory.rb
	db/schema.rb