Feature addition

Added gravity to player
Conflict resolution

Attended conflict resolution seminar at business class