Added persistence to stop watch and reset button
Merge branch 'master' of
https://github.com/eichelkrauta/3700-TrackEm.git

Conflicts:
	TrackEm_Glass/src/com/example/trackem_glass/TrackEmFragment.java
Properly merged, proper persistence for time stamp