added-functions
Merge branch 'new' of https://github.com/EdglLau/ICS313_A6 into new

Conflicts:
	Assignment6.lisp
Merge branch 'new' of https://github.com/EdglLau/ICS313_A6 into new

Conflicts:
	Assignment6.lisp