removed newline between
Merge branch 'master' of github.com:McKizzle/AoS

Conflicts:
	.travis.yml