refactored
Merge branch 'master' of https://github.com/aaronlong/projectex

Conflicts:
	projectX/src/projectX/model/Employee.java
	projectX/src/projectX/scrapper/Scrape.java