Testing
strings update for demo
fixing gitignore
git ignore
gitignore metadata
git ignore
Renamed files.
git ignore
Merge remote-tracking branch 'origin/master'
initial database class
Initial Database Help
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai.git
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai.git
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai.git
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai.git
Merge remote-tracking branch 'github/master'
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai

Conflicts:
	Bonsai/gen/org/srge/bonsai/R.java
Merge branch 'master' of https://github.com/Paradigm-FGCU/bonsai
Conflicts:
	Bonsai/gen/org/srge/bonsai/R.java