Minimized info to be added to site
removed edit.erb file
removed unnecessary views files
added .gitignore
removed vendor folder
merged conflict