* No clue what all has changed
Merge branch 'master' of https://github.com/s1m55r/sdfs.git

Conflicts:
	SDFS/src/com/scs/sdfs/client/ClientFileManager.java
	SDFS/src/com/scs/sdfs/client/ConsoleListener.java
* Fixed bunch of things