initial commit
Merge http://github.com/knight3001/rails_test