Update README.md
Merge pull request #25 from tedjk/master

Merged with saturdays work of wall team
Merged
Merge pull request #27 from tedjk/master

Monday merge
Fix format in database.java
commit to make different branches