Fixing
come on
Merge branch 'master' of
https://github.com/charlieouyang/ECE454Project1.git

Conflicts:
	ECE454Project1/src/Data/PropertiesOfPeer.java
Fucked up