commit
Merge branch 'master' of https://github.com/tasoskoutlis/Wireless-Data-Broadcast

Conflicts:
	types.h