Added comments and user stubb
Merge branch 'master' of https://github.com/AdamWhite/Sarcego

Conflicts:
	.gitignore