useless merge
Merge pull request #7 from meggiman/merger

Merger
Merge branch 'master' into manuel

Conflicts:
	src/Tables/TranspositionTable.java