Primo Incremento pt.1
Commit
Merge branch 'master' of https://github.com/johneisenheim/Placement

Conflicts:
	.gitignore