Stuff
Merge branch 'master' of github.com:rtgell/dbp2
Merge branch 'master' of github.com:rtgell/dbp2

Conflicts:
	Table.java
Merge branch 'master' of github.com:rtgell/dbp2
fixed typos in Table.java