lines
Merge branch 'master' of github.com:oncer/gamejam13
new stave
Merge branch 'master' of github.com:oncer/gamejam13

Conflicts:
	src/Stave.cpp
stave 2.0