conflict
Merge branch 'master' of https://github.com/nimmerman/test

Conflicts:
	about.cpp