Modded git ignore and composer
Merge branch 'master' of github.com:nbomberger/Hydrogen

Conflicts:
	composer.json