upgrading to rails 4
upgrading to rails 4
updating
upgrading...
Finished upgrading to rails4
delete some files
merging rails4 branch