filerename
update file rename
update file and 5we2
filecleanup
update 5w2e
Fixed merge conflict for W1C4.rb

* master:
  update 5w2e
  filecleanup
  update file and 5we2
  update file rename
  filerename

Conflicts:
	4week/W4C1.rb
Removed .rvmrc, in favor of .ruby-version and .ruby-gemset (not included in repo)