- Untracking the build folder
Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/server/Login.class
	build/classes/server/Register.class