menuEnd.png	-/Deleted	Remove	public_html\files\images\menuEnd.png
menuMain.png	-/Deleted	Remove	public_html\files\images\menuMain.png
menuSelect.png	-/Deleted	Remove	public_html\files\images\menuSelect.png
Merge origin/master
game.enemys.js	-/Modified	Commit	public_html\files\javascript\game.enemys.js
game.enemys.js	-/Modified	Commit	public_html\files\javascript\game.enemys.js
Merge origin/master

Conflicts:
	public_html/files/javascript/game.enemys.js

game.enemys.js	Modified/-	Commit	public_html\files\javascript\game.enemys.js