added some nx capabilities
added nx ...
Merge remote-tracking branch 'origin/master'

Conflicts:
	ldhomework/src/main/java/ld/ldhomework/crawler/FileParser.java
Merge remote-tracking branch 'origin/master'