Synchronising.
Testing gitignore

As above
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
Merge pull request #15 from Wedgebear/master

Synchronisation