<DE2>Some minor change
<Android>Integrate with Fahad's part
Merge branch 'master' of https://github.com/Ilikecattle/EECE381Module2