Update readme file
Combat event timestamp
Merge branch 'master' of https://github.com/yolopreux/ColloidUI

Conflicts:
	src/colloid/model/event/CombatEvent.java
Add damage done tree view