updating git ignore
committing rails 4.0.5 project now
Merge remote-tracking branch 'origin/master'