celanup
stuff
Merge branch 'master' of github.com:Skunenieki/sk-system-old

* 'master' of github.com:Skunenieki/sk-system-old:
  celanup

Conflicts:
	.gitignore