Merge branch 'master' of https://github.com/xcalboy11x/Are_You_Done_Yet_v1.0.0
Timer and Help Menu
Help and Timer Menu
added calendar
Fixed calendar bugs.
stuff
Merge branch 'master' of https://github.com/TimmyHuang/Are_You_Done_Yet_v1.0.0
Merge branch 'master' of https://github.com/TimmyHuang/Are_You_Done_Yet_v1.0.0

Conflicts:
	bin/classes.dex
	bin/classes/com/techbearcave/notetaker/R$layout.class
	bin/classes/com/techbearcave/notetaker/R$menu.class
	bin/classes/com/techbearcave/notetaker/R$string.class
	bin/classes/com/techbearcave/notetaker/R$style.class
	gen/com/techbearcave/notetaker/R.java
Merge branch 'master' of https://github.com/xcalboy11x/Are_You_Done_Yet_v1.0.0
Merge branch 'master' of https://github.com/Zilchary/Are_You_Done_Yet_v1.0.0-1

Conflicts:
	bin/classes.dex
	bin/classes/com/techbearcave/notetaker/R$layout.class
	bin/classes/com/techbearcave/notetaker/R$menu.class
	bin/classes/com/techbearcave/notetaker/R$string.class
	bin/classes/com/techbearcave/notetaker/R$style.class
	gen/com/techbearcave/notetaker/R.java
Merge branch 'master' of https://github.com/Zilchary/Are_You_Done_Yet_v1.0.0-1
Added Timer and Help Menu
Merge branch 'master' of https://github.com/Zilchary/Are_You_Done_Yet_v1.0.0-1
Pulling from calvin/wangs code
Merge branch 'master' of https://github.com/xcalboy11x/Are_You_Done_Yet_v1.0.0