deleted:    bin/cassandra_driver_test
	modified:   makefile
	deleted:    obj/cassandra_db.o
	deleted:    obj/cassandra_driver_test.o
Merge branch 'master' of github.com:srcvirus/pweb_home_agent

Conflicts:
	bin/cassandra_driver_test
	obj/cassandra_db.o
	obj/cassandra_driver_test.o