First commit. Empty rails framework.
resolving gitignore merge conflict