completing remaining methods
Merge branch 'master' of https://github.com/aokoli/COMP-473-Adv.-OOP

Conflicts:
	project 1/src/com/fms/main/Main.java