f
Merge branch 'master' of https://github.com/Able1991/fssp

Conflicts:
	app/models/request.rb
	db/development.sqlite3
fix