New with git, testing out branches.
Fiddling with git.
Practice.
practice
Reset master.
Test
updated canvas; y values as well as an altered set of x values
"Try looking at the moveList"
practice.
Merge branch 'master' of git://github.com/GamesCrafters/Gamesman5
Added some temporary lines for the graph.
Merge branch 'vvh-work'

Conflicts:
	assets/javascripts/vvh.coffee
Add branching tutorial to README
Merge remote-tracking branch 'origin/master' into fakedb