angefangen mit conway
Merge branch 'master' of https://github.com/maximilianhuber/softwareProjekt
Merge branch 'master' of https://github.com/maximilianhuber/softwareProjekt
added conways
Merge branch 'master' of https://github.com/maximilianhuber/softwareProjekt