MERGE branch krzysiek
merge
fixed indexing in slope
2014-12-16
2014-12-16
2014-12-16
Merge branch 'master' of https://github.com/MathIsFun/SlopeModel
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
Create README.md
Update README.md
javadoc and some fix change
javadoc and fixes
javadoc
Merge branch 'master' of https://github.com/mathisfun/SlopeModel into pawel

Conflicts:
	src/agent/Skier.java
	src/controller/Manager.java
	src/main/GUI.java
	src/main/Main.java
	src/slope/Elevator.java
	src/slope/Slope.java
	src/view/ButtonPanel.java
	src/view/SimulationSplitPane.java
	src/view/SkiPanel.java
	src/view/SlopeFrame.java
merging + rm doc