jklaj;asdj;asdl;adsl;adfsj;asdf
Merge branch 'master' of https://github.com/jvall/vormund

Conflicts:
	src/edu/cs408/vormund/Database.java
GUI is now slightly more working