fucked up commited changes
try again
try
try
try
git pull
git rebase --continue
git reset HEAD client/src/SignUp.java
Merge branch 'master' of https://github.com/Warosaurus/Dare2Date

Conflicts:
	Client/src/SignUp.java
	NBClient/Client/build/built-jar.properties
	NBClient/Client/build/classes/FormDetailsWindow.class
	NBClient/Client/build/classes/MainWindow$1.class
	NBClient/Client/build/classes/MainWindow$2.class
	NBClient/Client/build/classes/MainWindow$3.class
	NBClient/Client/build/classes/MainWindow$4.class
	NBClient/Client/build/classes/MainWindow.class
	NBClient/Client/build/classes/ProfileWindow$1.class
	NBClient/Client/build/classes/ProfileWindow$2.class
	NBClient/Client/build/classes/ProfileWindow.class
	NBClient/Client/dist/Dare2Date.jar