Fixed: removed unnecessary stuff from git ignore file
Added: phpStorm specific files/directories to be ignored
Fixed example
Resolved merge conflict
Thx to @johnhamelink FluentDom can now successfully loaded by composer
Merge pull request #18 from lapistano/master

Removes incompatabilities to newer versions of phpunit
Fixed composer.json
Merge pull request #19 from AlexandrFox/master

Fixed composer.json
Merge branch 'master' of github.com:FluentDOM/FluentDOM

Conflicts:
	.gitignore