Added some rules to .gitignore
Added playground.cfg
Corrected .gitignore cmake rules
Heat model integrated, finally :)
Merge pull request #18 from larics/heat-integration

Heat integration.
Updated messages?
Merge branch 'master' of github.com:larics/assisi-playground
Temporarily removed the test directory, because it seems to be causing build problems on some systems.
Commented out the test directory from CMakeLists.txt
Restored the test folder. It will still not be build, becase it has ben commented out of CMakeLists
Merge branch 'master' of https://github.com/larics/assisi-playground into heat
Merge branch 'heat' into vibration

Conflicts:
	CMakeLists.txt
	interactions/HeatActuator.cpp