Revert "DOPE BEACON THANNNGSS"

This reverts commit 8371152a61b1ba7f8dbdbf5d1260744cf52a24d8.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/wifi/Receiver.java
	src/wifi/Sender.java