classifier work in progress
Merge branch 'master' of https://github.com/UCSD-E4E/AngryBirds

Conflicts:
	main.cpp