adding stuff
more progress
Merge branch 'master' of depot

Conflicts:
	.gitignore
updated more