initial setup
Merge branch 'master' of https://github.com/jcarm010/Link

Conflicts:
	.gitignore