Intial Commit with Rails installation
Merge conflicts fixed