First Commit.
Merge branch 'master' of https://github.com/ForeverWintr/ski_patrol

Conflicts:
	.gitignore