allow setting layout parameters from main
add graph file scanner
remove file reading stuff from SocialNetwork
Merge branch 'master' into soln

Conflicts:
	src/SocialNetwork.java
fix SocialNetwork import
add fledgling GraphFileScannerTest
add empty graph test
move graph file scanner tempfile stuff to setup/teardown
flesh out graph file scanner test
clear out next line cache after call to nextLine()
fix graph file scanner
spaces to tabs
Merge branch 'master' into soln