Update Main.java

Changed main class message for dev
Added feature one
Commit after git reset --hard
Two commits after reset
Merge pull request #3 from deanefrati/feature-one

Feature one pull request
Added Feature Two
Commited feature two
Added another message on the main class
reverted merge of 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)
Merge pull request #6 from deanefrati/dev

Dev