renamed complete.html.erb
removed database.yml from gitignore
Merge branch 'master' of github.com:estreske/project2