This reverts commit 1008674a

scwartz values are added
Happiness is altered still not functioning optimaly but there is
improvement
Each agent has a neighborhood and thus also one uniform value of the
pollution

pollution always increases

Conflicts:
	LoadPoles/src/loadPoles/Human.java

electric cars now move once they are charged or empty

# Conflicts:
#	LoadPoles/src/loadPoles/Hippie.java
#	LoadPoles/src/loadPoles/Human.java

assholes

Cars have different expiration dates;
Function added with eProb for the chance of buying an electric car once
your car is expired

needsCharging is always true

Conflicts:
	LoadPoles/src/loadPoles/Hippie.java
	LoadPoles/src/loadPoles/Human.java
	LoadPoles/src/loadPoles/Neighbourhood.java

conformity

Env factors

See merge request !2

# Conflicts:
#   LoadPoles/velocity.log