First commit
First(second) commit
New ignores
Merge branch 'master' of https://github.com/bergstroem1/Galaxy

Conflicts:
	.gitignore