starting to setup SQL database
files have changes and now I'm adding them to the project
Merge branch 'master' of
https://github.com/wmb1232/HomeStayManagerApp.git

Conflicts:
	bin/HomeStayManagerAndroidApp.apk
	bin/R.txt
	bin/classes.dex
	bin/resources.ap_
	gen/com/example/homestaymanagerandroidapp/R.java