fixed indents
Merge branch 'master' of https://github.com/lrsjohnson/rolling

Conflicts:
	code/src/main.cpp