merged github created gitignore with the rails created one