notes

notes with database
Merge branch 'master' of https://github.com/xcalboy11x/Are_You_Done_Yet_v1.0.0

Conflicts:
	res/values/strings.xml
	src/com/techbearcave/AYDY/EditNoteActivity.java
removing extra stuff
started register account
finished creating user tables
finished creating user tables
Merge branch 'master' of https://github.com/TimmyHuang/Are_You_Done_Yet_v1.0.0

Conflicts:
	src/com/techbearcave/AYDY/LogInPage.java
interaction with users

updating interactions with users and their data
Merge branch 'master' of https://github.com/TimmyHuang/Are_You_Done_Yet_v1.0.0

Conflicts:
	bin/NoteTaker.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/techbearcave/AYDY/NewAccount.java
	src/com/techbearcave/AYDY/SQLiteHelper.java
user creation and log in database integration
Merge branch 'master' of https://github.com/TimmyHuang/Are_You_Done_Yet_v1.0.0

Conflicts:
	src/com/techbearcave/AYDY/LogInPage.java
	src/com/techbearcave/AYDY/SQLiteHelper.java