gitignore
Loader and column get working
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore