Fixed bugs
Merge branch 'master' of https://github.com/lrsjohnson/rolling

Conflicts:
	code/debug/rolling
	code/rolling
	code/src/main.cpp