changed layout
updated layout button
merge layout with pedometer
Merge branch 'master' of https://github.com/omanheim/Tempo

Conflicts:
	AndroidManifest.xml
	res/layout/activity_main.xml
	src/upenn/pennapps/MainActivity.java