Removed 'name' from 'user' table in SCHEMA
Removed bad import in Encryption that prevented compiling.
Merge branch 'master' of https://github.com/jvall/vormund

Conflicts:
	src/edu/cs408/vormund/Encryption.java