update .gitignore
Go back to normal status
to be continued

the timepicker has benn embedded ,but there are still some problems to
be solved
delete the date choose picker
git commit res/layout/activity_main.xml
git commit .
Merge branch 'newTimePicker'

Conflicts:
	res/values/strings.xml

git commit .gitignore gen/com/firstapp/alarmclock/R.java res/layout/activity_main.xml res/values/strings.xml src/com/firstapp/alarmclock/MainActivity.java