Added a README
Merged everythingggg
Merge branch 'master' of https://github.com/kenlimmj/cs2110_assignment-a6

Conflicts:
	src/student/Butterfly.java