need to merge
Merge branch 'master' into krzysiek
 df
20141216 10-07
fixed indexing in slope
still not finished
Merge branch 'krzysiek'

Conflicts:
	src/agent/Agents.java
	src/slope/Elevator.java
	src/view/SkiPanel.java
Merge branch 'master' of https://github.com/mathisfun/SlopeModel
v1.1