first nick commit
Merge branch 'master' of https://github.com/nickz8031/vilcock

Conflicts:
	.gitignore
.settings ignore