haha
haha
Merge remote-tracking branch 'origin/master'

Conflicts:
	HelpSignal-HelpSignal.iml
	HelpSignal.iml
	HelpSignal/src/main/java/com/cdvtc/helpsignal/MainActivity.java
haha