fixing rotation and ui
Merge branch 'master' of http://github.com/hemanthkini/hackcmu

Conflicts:
	src/com/example/pebblenav/MainActivity.java
#yolo
Merge branch 'master' of http://github.com/hemanthkini/hackcmu

Conflicts:
	src/com/example/pebblenav/MainActivity.java