Old code that needed to be commited before a pull.
Merge branch 'master' of git@github.com:Meldanya/pvg-vt13-team03.git

Conflicts:
	src/gui/RegisterFrame.java
Merge branch 'master' of github.com:Meldanya/pvg-vt13-team03