'capatilized SaaS'
'removed whitespace'
'df'
Merge branch 'master' of https://github.com/KShaw29/ruby-sample

Conflicts:
	web.rb