Conflicts:
.idea/workspace.xml
public/javascripts/game.core.js