New folder
First Commit with file structure
deleted some unnecessary files and .gitignored the username in database.yml
controller changes
merges fixed