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
Merge branch 'master' of https://github.com/Zilchary/Are_You_Done_Yet_v1.0.0-1
The delete button on note screen

The delete button is redisplayed when editing / making new note
Pulling from calvin/wangs code
Merge branch 'master' of https://github.com/xcalboy11x/Are_You_Done_Yet_v1.0.0
Able to delete note from listview and note screen

unable to redisplay yet from listview menu!
starting on task
Merge branch 'master' of https://github.com/TimmyHuang/Are_You_Done_Yet_v1.0.0

Conflicts:
	AndroidManifest.xml
Started XML changes for task / minor edits
Merge branch 'master' of https://github.com/xcalboy11x/Are_You_Done_Yet_v1.0.0
alert and task changes
Changes to editing task
Merge branch 'master' of https://github.com/TimmyHuang/Are_You_Done_Yet_v1.0.0
redoing shit done before
starting listtask and sql changes
Merge branch 'master' of https://github.com/xcalboy11x/Are_You_Done_Yet_v1.0.0