added chai test
testing conway
deleted files
added Generic Methods
chai test added
resolving conflicts before merge
merging