temp commit
temp commmit
Merge branch 'TimeKeeperCreatingUIBranch' of https://github.com/sud007/Timekeeper into TimeKeeperCreatingUIBranch

Conflicts:
	.gitignore
	gen/com/cleanapps/timekeeper/R.java