Database mostly complete. Registration and login set up.
Merge remote-tracking branch 'origin/master'

Conflicts:
	rw344/.classpath