.
Merge branch 'master' of https://github.com/zhanivanov/calgon1

Conflicts:
	calgon/Enemy.cs
	calgon/bin/Debug/calgon.exe
	calgon/bin/Debug/calgon.pdb
	calgon/bin/Debug/calgon.vshost.exe.manifest
	calgon/obj/Debug/calgon.exe
	calgon/obj/Debug/calgon.pdb
.
Merge branch 'master' of https://github.com/zhanivanov/calgon1

Conflicts:
	calgon/bin/Debug/calgon.exe
	calgon/bin/Debug/calgon.pdb
	calgon/obj/Debug/calgon.exe
	calgon/obj/Debug/calgon.pdb
Merge branch 'master' of https://github.com/zhanivanov/calgon1

Conflicts:
	calgon/Enemy.cs
Merge branch 'master' of https://github.com/zhanivanov/calgon1
+ health bar
TODO: player collision with enemies not correct