Adding to github
Merge branch 'master' of https://github.com/johnsextro/Composer

Conflicts:
	.gitignore