Merged beginner repo that we worked on