trolololol
Merge branch 'master' of https://github.com/markbuikema/bearded-bugfixes

Conflicts:
	InternetTech/src/internettech/client/ExchangeScreen.java
	InternetTech/src/internettech/client/fxml_exchangescreen.fxml
	InternetTech/src/internettech/manager/ShareManager.java
	InternetTech/src/internettech/protocol/SaxProtocol.java