Removed some trailing whitespace, fixed a typo.
Merge branch 'master' of github.com:mackorone/two

Conflicts:
	src/viz/Viz.cpp