Merge pull request #4 from royalaid/master

Refactoring and Functional Changes
Major push of all new code for the scrapper
Merge branch 'master' of https://github.com/summersb92/aeolipile

Conflicts:
	src/Engine.java
	src/Outfile.java