Touch up
Merge branch 'testing'

Conflicts:
	Main/src/tk/zeryter/p2pchat/Crypt.java
	Main/src/tk/zeryter/p2pchat/DiscoveryNet.java
	Main/src/tk/zeryter/p2pchat/Network.java
	Main/src/tk/zeryter/p2pchat/P2PChatMain.java
	Main/src/tk/zeryter/p2pchat/window/Canvas.java
	Main/src/tk/zeryter/p2pchat/window/GUI.java
	Main/src/tk/zeryter/p2pchat/window/Window.java
	Main/src/tk/zeryter/p2pchat/window/WindowMonitor.java
set to not local
broken ... again
frame and stuff
frame and stuff
things
added a menubar
Merge branch 'rewrite' of https://github.com/Owen-Holloway101/P2P-CHAT into rewrite

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
big ol commmit
Things
fixed menu windows opening
touch up
MainWindow UI is now a thing
MainWindow UI is now a thing
Dat_Encryption
Dat_Encryption
MainWindow UI is now a thing
Encryption is working 100%