Commit
Merge https://github.com/SillyKnight/CSE100

Conflicts:
	README.md