Defines in Makefile
Merge branch 'master' of
https://github.com/centeropenmiddleware/solowan-simulator into devel

Conflicts:
	.gitignore
git ignore