what?
Merge branch 'master' of https://github.com/Multiagents/applethrower
Merge branch 'master' of https://github.com/Multiagents/applethrower
Merge branch 'master' of https://github.com/osurdml/applethrower

Conflicts:
	main/main.cpp
fix conflicts
Merge branch 'master' of https://github.com/Multiagents/applethrower
Merge branch 'master' of https://github.com/Multiagents/applethrower
Merge branch 'master' of https://github.com/Multiagents/applethrower
Merge branch 'master' of https://github.com/Multiagents/applethrower
main/main.cpp