initialized play framework application
resolved .gitignore conflicts