updated local. and the i will pull from remote
Merge branch 'master' of github.com:bocc/Facebook

Conflicts:
	src/test/java/myTest/SearchCompany.java
Merge branch 'master' of github.com:bocc/Facebook

Conflicts:
	src/test/java/myTest/SearchCompany.java
Merge branch 'master' of github.com:bocc/Facebook
Merge branch 'master' of github.com:bocc/Facebook

Conflicts:
	src/test/java/myTest/SearchCompany.java
Merge branch 'master' of github.com:bocc/Facebook
Merge branch 'master' of github.com:bocc/Facebook
Merge branch 'master' of github.com:bocc/Facebook

Conflicts:
	src/test/java/myTest/SearchCompany.java