change index
Merge branch 'master' of https://github.com/risentteam/online_system
something unimportant
merging
some fix
add_list_of_requistion
fix_list_requistion
Merge branch 'master' into Buildings

Conflicts:
	app/controllers/requistions_controller.rb
	db/schema.rb