Stuff
Merge branch 'master' of https://github.com/circlingthesun/Masters

Conflicts:
	cloudclean/thirdparty/EigenLibSVM