Adding Intellij files to ignore
Moving BeforeX and AfterX functionality to listener
Merge remote-tracking branch 'origin/cucumbersauce' into cucumbersauce

Conflicts:
	.gitignore