Merge pull request #8 from undeadbeastking/Agatha

Agatha
Master commits 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/Main.java
Master commit number 2
Resolve conflict done
Try to create a conflict
Merge pull request #10 from undeadbeastking/master

Merge from conflict.