period
Merge branch 'master' of https://github.com/Trojanovs/Accelerometer

Conflicts:
	src/com/trojanov/accelerometer/AccelerometerActivity.java