added floor and played with config
Merge branch 'master' of https://github.com/philipheimboeck/hva_springs

Conflicts:
	project/AdvancedPhysics/Assignment4_WallOfBoxes/main.cpp