some conflicts or something
Merge branch 'master' of https://github.com/ProjPossibility/CSUN-AudioAlert1
Merge branch 'master' of https://github.com/ProjPossibility/CSUN-AudioAlert1
Merged Image folders