Changed main.cc
fsaf
wq
tesrt
test
safasfMerge branch 'master' of github.com:jamesfranco/quadris

Conflicts:
	main.cc