First Commit
First Commit
Merge branch 'master' of github.com:alanleard/CrossPlatform

Conflicts:
	.gitignore