clean some commented-out stuff
Should fix app crash when hitting awake button. Navigates to main screen.
Merge branch 'master' of https://github.com/Mikejoro/eecs395.git

Conflicts:
	SmartAlarm/src/com/example/smartalarm/SleepModeActivity.java