Basic interfaceing and searching done
Merge branch 'master' into search

Conflicts:
	src/Node.java
Merge fixes and getting edge.. (TODO)
Merge branch 'search'