Merge branch 'master' of /Users/galafit/IdeaProjects/DreamRecorder with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/dream/RunGraph.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Method setStart was added