merged application.html.erb
added to gitignore and merged Gemfile