Dummy change
I don't even think this branch matters anymore
Merge branch 'BensChanges' of https://github.com/Aleph-Naught/SE3350Y into BensChanges

Conflicts:
	FireAlertScanner/src/se3350y/aleph/ScanActivity/ScanActivity.java