First commit
Merge branch 'master' of github.com:mekmarriott/Scripta2

Conflicts:
	.gitignore