Added Feature Two
Commited feature two
fixed feature two
Merge remote-tracking branch 'origin/dev' into feature-two

Conflicts:
	src/main/java/Main.java
Merge pull request #5 from deanefrati/feature-two

Feature two (fixed)