Patches and code
Merge branch 'master' of https://github.com/jk-5/Nailed

Conflicts:
	.gitignore