Fixed issues with git commits
Merge branch 'master' of https://github.com/jackybigz/samplelog

Conflicts:
	app/models/request.rb
	app/views/requests/_form.html.erb
	app/views/requests/show.html.erb
	db/schema.rb