data parsing project
Merge branch 'tabu' of https://github.com/tomecki/cats into tabu

Conflicts:
	cats/adaptiveTabuSearch/tabuSearch.py