Beta version of Data base and Analysis
Merge pull request #7 from randalholmes/master

Beta version of Data base and Analysis
Merge remote-tracking branch 'upstream/master'

Conflicts:
	scripts/networkDatabase.js