GPS activity added
Keystore and ant files added
Merge branch 'lab7-cs' into cs