initial commit
Merge branch 'master' of https://github.com/yoosername/confluence-stuff

Conflicts:
	.gitignore

pulled latest from github
adding gitignore