still fighting
forced update
Merge branch 'master' of git://github.com/HyborianSolutions/config

Conflicts:
	composer.json